Merge remote-tracking branch 'refs/remotes/origin/master' into stable

CHANGELOG.md

@@ -1,14 +1,32 @@
 # Changelog
 
-## vNext (TBD)
+## vNext (10.2)
 
-These changes have not been released to the official Visual Studio extension gallery, but (if checked) are available in preview within the [CI build](http://vsixgallery.com/extension/4c82e17d-927e-42d2-8460-b473ac7df316/).
+These changes have not been released to the Visual Studio marketplace, but (if checked) are available in preview within the [CI build](http://vsixgallery.com/extension/4c82e17d-927e-42d2-8460-b473ac7df316/).
 
-- [ ] TBD
+- [x] Features
+
+- [x] Fixes
 
 ## Previous Releases
 
-These are the changes to each version that has been released to the official Visual Studio extension gallery.
+These are the changes to each version that has been released to the Visual Studio marketplace.
+
+## 10.2
+
+**2017-01-01**
+
+- [x] Features
+  - [x] [#284](https://github.com/codecadwallader/codemaid/issues/284) - Performance improvements to compiling regular expressions - thanks [flagbug](https://github.com/flagbug)!
+  - [x] [#298](https://github.com/codecadwallader/codemaid/issues/298) - First class support for VB regions (viewing, inserting and removing)
+  - [x] [#337](https://github.com/codecadwallader/codemaid/issues/337) - Reorganizing: Add option to put explicit interface implementations after other members - thanks [samcragg](https://github.com/samcragg)!
+  - [x] [#371](https://github.com/codecadwallader/codemaid/issues/371) - Support for VS2017 RC
+
+- [x] Fixes
+  - [x] [#290](https://github.com/codecadwallader/codemaid/issues/290) - Finding: When track active item is enabled an error can be displayed on invocation
+  - [x] [#315](https://github.com/codecadwallader/codemaid/issues/315) - Reorganizing: Explicit interface implementations may take multiple passes to get in stable order - thanks [samcragg](https://github.com/samcragg)!
+  - [x] [#326](https://github.com/codecadwallader/codemaid/issues/326) - Digging: VB comments were not visible
+  - [x] [#342](https://github.com/codecadwallader/codemaid/issues/342) - Digging: VB regions were not visible - thanks [aeab13](https://github.com/aeab13)!
 
 ## 10.1
 

CodeMaid.IntegrationTests/Cleaning/VisualStudio/Data/RemoveAndSortUsingStatements.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System;
+
+namespace SteveCadwallader.CodeMaid.IntegrationTests.Cleaning.VisualStudio.Data
+{
+    public class Class
+    {
+        public String String { get; set; }
+        public StringBuilder StringBuilder { get; set; }
+    }
+}

CodeMaid.IntegrationTests/Cleaning/VisualStudio/Data/RemoveAndSortUsingStatements_Cleaned.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Text;
+
+namespace SteveCadwallader.CodeMaid.IntegrationTests.Cleaning.VisualStudio.Data
+{
+    public class Class
+    {
+        public String String { get; set; }
+        public StringBuilder StringBuilder { get; set; }
+    }
+}

CodeMaid.IntegrationTests/Cleaning/VisualStudio/ReinsertAfterRemoveUnusedUsingStatementsTests.cs

@@ -45,7 +45,7 @@ public void TestCleanup()
         [HostType("VS IDE")]
         public void CleaningVisualStudioReinsertAfterRemoveUnusedUsingStatements_RunsAsExpected()
         {
-            Settings.Default.Cleaning_RunVisualStudioRemoveUnusedUsingStatements = true;
+            Settings.Default.Cleaning_RunVisualStudioRemoveAndSortUsingStatements = true;
             Settings.Default.Cleaning_UsingStatementsToReinsertWhenRemovedExpression = "using System;||using System.Linq;";
 
             TestOperations.ExecuteCommandAndVerifyResults(RunRemoveUnusedUsingStatements, _projectItem, @"Data\ReinsertAfterRemoveUnusedUsingStatements_Cleaned.cs");
@@ -55,7 +55,7 @@ public void CleaningVisualStudioReinsertAfterRemoveUnusedUsingStatements_RunsAsE
         [HostType("VS IDE")]
         public void CleaningVisualStudioReinsertAfterRemoveUnusedUsingStatements_DoesNothingWhenSettingIsDisabled()
         {
-            Settings.Default.Cleaning_RunVisualStudioRemoveUnusedUsingStatements = false;
+            Settings.Default.Cleaning_RunVisualStudioRemoveAndSortUsingStatements = false;
             Settings.Default.Cleaning_UsingStatementsToReinsertWhenRemovedExpression = "using System;||using System.Linq;";
 
             TestOperations.ExecuteCommandAndVerifyNoChanges(RunRemoveUnusedUsingStatements, _projectItem);
@@ -67,7 +67,7 @@ public void CleaningVisualStudioReinsertAfterRemoveUnusedUsingStatements_DoesNot
 
         private static void RunRemoveUnusedUsingStatements(Document document)
         {
-            _usingStatementCleanupLogic.RemoveUnusedUsingStatements(document.GetTextDocument());
+            _usingStatementCleanupLogic.RemoveAndSortUsingStatements(document.GetTextDocument());
         }
 
         #endregion Helpers

CodeMaid.IntegrationTests/Cleaning/VisualStudio/RemoveUnusedUsingStatementsTests.cs → CodeMaid.IntegrationTests/Cleaning/VisualStudio/RemoveAndSortUsingStatementsTests.cs

@@ -8,9 +8,9 @@
 namespace SteveCadwallader.CodeMaid.IntegrationTests.Cleaning.VisualStudio
 {
     [TestClass]
-    [DeploymentItem(@"Cleaning\VisualStudio\Data\RemoveUnusedUsingStatements.cs", "Data")]
-    [DeploymentItem(@"Cleaning\VisualStudio\Data\RemoveUnusedUsingStatements_Cleaned.cs", "Data")]
-    public class RemoveUnusedUsingStatementsTests
+    [DeploymentItem(@"Cleaning\VisualStudio\Data\RemoveAndSortUsingStatements.cs", "Data")]
+    [DeploymentItem(@"Cleaning\VisualStudio\Data\RemoveAndSortUsingStatements_Cleaned.cs", "Data")]
+    public class RemoveAndSortUsingStatementsTests
     {
         #region Setup
 
@@ -28,7 +28,7 @@ public static void ClassInitialize(TestContext testContext)
         public void TestInitialize()
         {
             TestEnvironment.CommonTestInitialize();
-            _projectItem = TestEnvironment.LoadFileIntoProject(@"Data\RemoveUnusedUsingStatements.cs");
+            _projectItem = TestEnvironment.LoadFileIntoProject(@"Data\RemoveAndSortUsingStatements.cs");
         }
 
         [TestCleanup]
@@ -43,38 +43,38 @@ public void TestCleanup()
 
         [TestMethod]
         [HostType("VS IDE")]
-        public void CleaningVisualStudioRemoveUnusedUsingStatements_RunsAsExpected()
+        public void CleaningVisualStudioRemoveAndSortUsingStatements_RunsAsExpected()
         {
-            Settings.Default.Cleaning_RunVisualStudioRemoveUnusedUsingStatements = true;
+            Settings.Default.Cleaning_RunVisualStudioRemoveAndSortUsingStatements = true;
 
-            TestOperations.ExecuteCommandAndVerifyResults(RunRemoveUnusedUsingStatements, _projectItem, @"Data\RemoveUnusedUsingStatements_Cleaned.cs");
+            TestOperations.ExecuteCommandAndVerifyResults(RunRemoveAndSortUsingStatements, _projectItem, @"Data\RemoveAndSortUsingStatements_Cleaned.cs");
         }
 
         [TestMethod]
         [HostType("VS IDE")]
-        public void CleaningVisualStudioRemoveUnusedUsingStatements_DoesNothingOnSecondPass()
+        public void CleaningVisualStudioRemoveAndSortUsingStatements_DoesNothingOnSecondPass()
         {
-            Settings.Default.Cleaning_RunVisualStudioRemoveUnusedUsingStatements = true;
+            Settings.Default.Cleaning_RunVisualStudioRemoveAndSortUsingStatements = true;
 
-            TestOperations.ExecuteCommandTwiceAndVerifyNoChangesOnSecondPass(RunRemoveUnusedUsingStatements, _projectItem);
+            TestOperations.ExecuteCommandTwiceAndVerifyNoChangesOnSecondPass(RunRemoveAndSortUsingStatements, _projectItem);
         }
 
         [TestMethod]
         [HostType("VS IDE")]
-        public void CleaningVisualStudioRemoveUnusedUsingStatements_DoesNothingWhenSettingIsDisabled()
+        public void CleaningVisualStudioRemoveAndSortUsingStatements_DoesNothingWhenSettingIsDisabled()
         {
-            Settings.Default.Cleaning_RunVisualStudioRemoveUnusedUsingStatements = false;
+            Settings.Default.Cleaning_RunVisualStudioRemoveAndSortUsingStatements = false;
 
-            TestOperations.ExecuteCommandAndVerifyNoChanges(RunRemoveUnusedUsingStatements, _projectItem);
+            TestOperations.ExecuteCommandAndVerifyNoChanges(RunRemoveAndSortUsingStatements, _projectItem);
         }
 
         #endregion Tests
 
         #region Helpers
 
-        private static void RunRemoveUnusedUsingStatements(Document document)
+        private static void RunRemoveAndSortUsingStatements(Document document)
         {
-            _usingStatementCleanupLogic.RemoveUnusedUsingStatements(document.GetTextDocument());
+            _usingStatementCleanupLogic.RemoveAndSortUsingStatements(document.GetTextDocument());
         }
 
         #endregion Helpers

CodeMaid.IntegrationTests/CodeMaid.IntegrationTests.csproj

@@ -243,16 +243,10 @@
     <Compile Include="Cleaning\Remove\RemoveEmptyRegionsTests.cs" />
     <Compile Include="Cleaning\Remove\RemoveSetOfRegionsTests.cs" />
     <Compile Include="Cleaning\Remove\RemoveSelectedRegionsTests.cs" />
-    <Content Include="Cleaning\VisualStudio\Data\SortUsingStatements.cs">
+    <Content Include="Cleaning\VisualStudio\Data\RemoveAndSortUsingStatements.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Cleaning\VisualStudio\Data\SortUsingStatements_Cleaned.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Cleaning\VisualStudio\Data\RemoveUnusedUsingStatements.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Cleaning\VisualStudio\Data\RemoveUnusedUsingStatements_Cleaned.cs">
+    <Content Include="Cleaning\VisualStudio\Data\RemoveAndSortUsingStatements_Cleaned.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Cleaning\VisualStudio\Data\ReinsertAfterRemoveUnusedUsingStatements.cs">
@@ -284,8 +278,7 @@
     <Compile Include="Cleaning\Update\FileHeaderCPlusPlusTests.cs" />
     <Compile Include="Cleaning\Update\FileHeaderCSharpTests.cs" />
     <Compile Include="Cleaning\VisualStudio\ReinsertAfterRemoveUnusedUsingStatementsTests.cs" />
-    <Compile Include="Cleaning\VisualStudio\RemoveUnusedUsingStatementsTests.cs" />
-    <Compile Include="Cleaning\VisualStudio\SortUsingStatementsTests.cs" />
+    <Compile Include="Cleaning\VisualStudio\RemoveAndSortUsingStatementsTests.cs" />
     <Compile Include="Formatting\StandardCommentFormatTests.cs" />
     <Compile Include="Formatting\BaseCommentFormatTests.cs" />
     <Compile Include="Formatting\StylecopHeaderFormatTests.cs" />

CodeMaid.UnitTests/CodeMaid.UnitTests.csproj

@@ -80,11 +80,35 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\Microsoft.VSSDK.UnitTestLibrary.dll</HintPath>
     </Reference>
+    <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Design" />
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="EnvDTE">
+      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="EnvDTE80">
+      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
@@ -97,6 +121,7 @@
     <Compile Include="Formatting\SimpleFormattingTests.cs" />
     <Compile Include="Formatting\XmlFormattingTests.cs" />
     <Compile Include="Formatting\ListFormattingTests.cs" />
+    <Compile Include="Helpers\CodeItemTypeComparerTests.cs" />
     <Compile Include="Helpers\CodeMaidPackageHelper.cs" />
     <Compile Include="Helpers\UIShellServiceMock.cs" />
     <Compile Include="Helpers\WindowFrameMock.cs" />
@@ -116,6 +141,7 @@
       <Link>Properties\CodeMaid.snk</Link>
     </None>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">