From 45f7678fc20943bfa0e8d948f62af75342eb99ad Mon Sep 17 00:00:00 2001
From: Dakota Hawkins <dakotahawkins@gmail.com>
Date: Tue, 26 Sep 2017 15:06:09 -0400
Subject: [PATCH 1/2] Update NuGet packages

---
 IncludeToolbox/IncludeToolbox.csproj | 23 +++++++++++++----------
 IncludeToolbox/packages.config       | 10 +++++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/IncludeToolbox/IncludeToolbox.csproj b/IncludeToolbox/IncludeToolbox.csproj
index 4896489..086fae4 100644
--- a/IncludeToolbox/IncludeToolbox.csproj
+++ b/IncludeToolbox/IncludeToolbox.csproj
@@ -143,7 +143,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -191,14 +191,17 @@
       <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.0.26607\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -275,14 +278,13 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.9\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.9\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.9\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.9\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -293,4 +295,5 @@
   <Target Name="AfterBuild" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Copy SourceFiles="$(OutputPath)$(TargetName).vsix" DestinationFolder="$(SolutionDir)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
   </Target>
+  <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.12\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
 </Project>
\ No newline at end of file
diff --git a/IncludeToolbox/packages.config b/IncludeToolbox/packages.config
index 76e7edd..d7e298a 100644
--- a/IncludeToolbox/packages.config
+++ b/IncludeToolbox/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26606" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Imaging" version="15.0.26606" targetFramework="net461" />
-  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
-  <package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.9" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.12" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26606" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26606" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net461" />
@@ -15,8 +15,8 @@
   <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
-  <package id="Microsoft.VisualStudio.Threading" version="15.3.23" targetFramework="net461" />
-  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26606" targetFramework="net461" />
-  <package id="Microsoft.VisualStudio.Validation" version="15.3.15" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26607" targetFramework="net461" />
+  <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net461" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net461" developmentDependency="true" />
 </packages>
\ No newline at end of file

From 7f2f0e0e573334f526f27880c9055eb1141fd29b Mon Sep 17 00:00:00 2001
From: Dakota Hawkins <dakotahawkins@gmail.com>
Date: Tue, 26 Sep 2017 15:06:29 -0400
Subject: [PATCH 2/2] Remove check that prevents adding newlines before the
 last line

de88fd1c added a check to prevent adding a newline before the last line in
a batch. Since we're prepending, however, a newline is desirable if the
last line is the only one in its group.

Fixes #48
---
 IncludeToolbox.vsix                           |  4 +-
 IncludeToolbox/Formatter/IncludeFormatter.cs  | 45 +++++++++----------
 .../Package/source.extension.vsixmanifest     |  2 +-
 Tests/IncludeFormatingTest.cs                 | 21 ++++++++-
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/IncludeToolbox.vsix b/IncludeToolbox.vsix
index 8454b46..364942f 100644
--- a/IncludeToolbox.vsix
+++ b/IncludeToolbox.vsix
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77be8c5da4736b2179aefe8d63416b22e9669705abb3b737253894c7e5ce1d9d
-size 127968
+oid sha256:f4ec4aaa3219ec043b34823548bbf7c624755ee153c69cc8fedf607070e63771
+size 128172
diff --git a/IncludeToolbox/Formatter/IncludeFormatter.cs b/IncludeToolbox/Formatter/IncludeFormatter.cs
index b54763b..0b5f61f 100644
--- a/IncludeToolbox/Formatter/IncludeFormatter.cs
+++ b/IncludeToolbox/Formatter/IncludeFormatter.cs
@@ -120,9 +120,7 @@ private static bool SortIncludeBatch(FormatterOptionsPage settings, string[] pre
                                             List<IncludeLineInfo> outSortedList, IEnumerable<IncludeLineInfo> includeBatch)
         {
             // Get enumerator and cancel if batch is empty.
-            var originalLineEnumerator = includeBatch.GetEnumerator();
-            bool hasElements = originalLineEnumerator.MoveNext();
-            if (!hasElements)
+            if (!includeBatch.Any())
                 return false;
 
             // Fetch settings.
@@ -178,41 +176,40 @@ private static bool SortIncludeBatch(FormatterOptionsPage settings, string[] pre
             else if (typeSorting == FormatterOptionsPage.TypeSorting.QuotedFirst)
                 sortedIncludes = sortedIncludes.OrderBy(x => x.LineDelimiterType == IncludeLineInfo.DelimiterType.Quotes ? 0 : 1);
 
-            // Finally, update the actual lines
+            // Merge sorted includes with original non-include lines
+            var sortedIncludeEnumerator = sortedIncludes.GetEnumerator();
+            var sortedLines = includeBatch.Select(originalLine =>
             {
-                bool firstLine = true;
-
-                foreach (var sortedLine in sortedIncludes)
+                if (originalLine.ContainsActiveInclude)
                 {
-                    // Advance until there is an include line to replace. There *must* be one left if sortedIncludes is not empty.
-                    while (!originalLineEnumerator.Current.ContainsActiveInclude)
-                    {
-                        outSortedList.Add(originalLineEnumerator.Current);
-                        hasElements = originalLineEnumerator.MoveNext();
-                        System.Diagnostics.Debug.Assert(hasElements, "There must be an element left in the original list if there are still sorted elements to put back in.");
-                    }
+                    // Replace original include with sorted includes
+                    return sortedIncludeEnumerator.MoveNext() ? sortedIncludeEnumerator.Current : new IncludeLineInfo();
+                }
+                return originalLine;
+            });
 
-                    bool isLastLine = !originalLineEnumerator.MoveNext();
+            if (settings.RemoveEmptyLines)
+            {
+                // Removing duplicates may have introduced new empty lines
+                sortedLines = sortedLines.Where(sortedLine => !string.IsNullOrWhiteSpace(sortedLine.RawLine));
+            }
 
+            // Finally, update the actual lines
+            {
+                bool firstLine = true;
+                foreach (var sortedLine in sortedLines)
+                {
                     // Handle prepending a newline if requested, as long as:
                     // - this include is the begin of a new group
                     // - it's not the first line
-                    // - it's not the last line of the batch.
                     // - the previous line isn't already a non-include
-                    if (groupStarts.Contains(sortedLine) && !firstLine && !isLastLine && outSortedList[outSortedList.Count - 1].ContainsActiveInclude)
+                    if (groupStarts.Contains(sortedLine) && !firstLine && outSortedList[outSortedList.Count - 1].ContainsActiveInclude)
                     {
                         outSortedList.Add(new IncludeLineInfo());
                     }
                     outSortedList.Add(sortedLine);
                     firstLine = false;
                 }
-
-                while (hasElements)
-                {
-                    if (!originalLineEnumerator.Current.ContainsActiveInclude)
-                        outSortedList.Add(originalLineEnumerator.Current);
-                    hasElements = originalLineEnumerator.MoveNext();
-                }
             }
 
             return true;
diff --git a/IncludeToolbox/Package/source.extension.vsixmanifest b/IncludeToolbox/Package/source.extension.vsixmanifest
index 63c64ba..3dade45 100644
--- a/IncludeToolbox/Package/source.extension.vsixmanifest
+++ b/IncludeToolbox/Package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="IncludeToolbox.Andreas Reich.075c2e2b-7b71-45ba-b2e6-c1dadc81cfac" Version="2.2.0.1" Language="en-US" Publisher="Andreas Reich" />
+        <Identity Id="IncludeToolbox.Andreas Reich.075c2e2b-7b71-45ba-b2e6-c1dadc81cfac" Version="2.2.1" Language="en-US" Publisher="Andreas Reich" />
         <DisplayName>IncludeToolbox</DisplayName>
         <Description xml:space="preserve">Various tools for managing C/C++ #includes: Formatting, sorting, exploring, pruning.</Description>
         <License>license.txt</License>
diff --git a/Tests/IncludeFormatingTest.cs b/Tests/IncludeFormatingTest.cs
index 70e20a1..c6953ae 100644
--- a/Tests/IncludeFormatingTest.cs
+++ b/Tests/IncludeFormatingTest.cs
@@ -46,7 +46,11 @@ public void Sorting_BlanksAfterRegexGroup()
 
 #include ""a.h""
 #include <b.hpp>
-#include <c.hpp>";
+#include <c.hpp>
+
+
+
+";
 
             string expectedFormatedCode_WithBlanks =
 @"#include ""filename.h""
@@ -56,7 +60,11 @@ public void Sorting_BlanksAfterRegexGroup()
 #include ""c_third""
 
 #include ""z_first""
+
 // A comment
+
+
+
 ";
 
 
@@ -87,7 +95,11 @@ public void Sorting_AngleBracketsFirst()
 #include <b.hpp>
 #include <c.hpp>
 #include ""filename.h""
-#include ""a.h""";
+#include ""a.h""
+
+
+
+";
 
 
             string expectedFormatedCode_WithBlanks =
@@ -98,7 +110,11 @@ public void Sorting_AngleBracketsFirst()
 #include ""c_third""
 
 #include ""z_first""
+
 // A comment
+
+
+
 ";
 
 
@@ -244,6 +260,7 @@ public void OtherPreprocessorDirectives()
 // A comment
 #include <d>
 #include ""a9""
+
 #else
 #include <a2>