CurrentDocument key from precedence regex works now in Try And Error Removal ignore list as well.

Default for try and error removal ingore list contains a regex that matches what identifies usually as the "matching header file"
Fixes #27

Author: Wumpf

IncludeToolbox/Formatter/IncludeFormatter.cs

@@ -90,32 +90,14 @@ private static void FormatSlashes(IEnumerable<IncludeLineInfo> lines, FormatterO
             }
         }
 
-        public const string CurrentFileNameKey = "$(currentFilename)";
-
-        /// <summary>
-        /// Replaces special macros in a precedence regex list.
-        /// </summary>
-        /// <param name="precedenceRegexes"></param>
-        /// <param name="documentName">Name of the current document without extension.</param>
-        /// <returns></returns>
-        private static string[] FixupRegexes(string[] precedenceRegexes, string documentName)
-        {
-            string[] regexes = new string[precedenceRegexes.Length];
-            for (int i = 0; i < precedenceRegexes.Length; ++i)
-            {
-                regexes[i] = precedenceRegexes[i].Replace(CurrentFileNameKey, documentName);
-            }
-            return regexes;
-        }
-
         private static void SortIncludes(ref List<IncludeLineInfo> lines, FormatterOptionsPage settings, string documentName)
         {
             FormatterOptionsPage.TypeSorting typeSorting = settings.SortByType;
             bool regexIncludeDelimiter = settings.RegexIncludeDelimiter;
             bool blankAfterRegexGroupMatch = settings.BlankAfterRegexGroupMatch;
             bool removeEmptyLines = settings.RemoveEmptyLines;
 
-            string[] precedenceRegexes = FixupRegexes(settings.PrecedenceRegexes, documentName);
+            string[] precedenceRegexes = RegexUtils.FixupRegexes(settings.PrecedenceRegexes, documentName);
 
             // Select only valid include lines and sort them. They'll stay in this relative sorted
             // order when rearranged by regex precedence groups.

IncludeToolbox/IncludeToolbox.csproj

@@ -87,6 +87,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="GraphWindow\ViewModel\IncludeTreeViewItem.cs" />
+    <Compile Include="RegexUtils.cs" />
     <Compile Include="TryAndErrorRemoval.cs" />
     <Compile Include="Commands\TryAndErrorRemoval_CodeWindow.cs" />
     <Compile Include="Commands\TryAndErrorRemoval_Project.cs" />

IncludeToolbox/Options/FormatterOptionsPage.cs

@@ -85,12 +85,12 @@ public enum SlashMode
 
         [Category("Sorting")]
         [DisplayName("Precedence Regexes")]
-        [Description("Earlier match means higher sorting priority.\n\"" + Formatter.IncludeFormatter.CurrentFileNameKey + "\" will be replaced with the current file name without extension.")]
+        [Description("Earlier match means higher sorting priority.\n\"" + RegexUtils.CurrentFileNameKey + "\" will be replaced with the current file name without extension.")]
         public string[] PrecedenceRegexes {
             get { return precedenceRegexes; }
             set { precedenceRegexes = value.Where(x => x.Length > 0).ToArray(); } // Remove empty lines.
         }
-        private string[] precedenceRegexes = new string[] { $"(?i){Formatter.IncludeFormatter.CurrentFileNameKey}\\.(h|hpp|hxx|inl|c|cpp|cxx)(?-i)" };
+        private string[] precedenceRegexes = new string[] { $"(?i){RegexUtils.CurrentFileNameKey}\\.(h|hpp|hxx|inl|c|cpp|cxx)(?-i)" };
 
         public enum TypeSorting
         {

IncludeToolbox/Options/TryAndErrorRemovalOptionsPage.cs

@@ -31,8 +31,9 @@ public enum IncludeRemovalOrder
 
         [Category("Try And Error Include Removal")]
         [DisplayName("Ignore List")]
-        [Description("List of regexes. If the content of a #include directive match with any of these, it will be ignored.")]
-        public string[] IgnoreList { get; set; } = new string[] { ".inl", "_inl.h" };
+        [Description("List of regexes. If the content of a #include directive match with any of these, it will be ignored." +
+                       "\n\"" + RegexUtils.CurrentFileNameKey + "\" will be replaced with the current file name without extension.")]
+        public string[] IgnoreList { get; set; } = new string[] { $"(\\/|\\\\|^){RegexUtils.CurrentFileNameKey}\\.(h|hpp|hxx|inl|c|cpp|cxx)$", ".inl", "_inl.h" };
 
         [Category("Try And Error Include Removal")]
         [DisplayName("Keep Line Breaks")]

IncludeToolbox/RegexUtils.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IncludeToolbox
+{
+    static class RegexUtils
+    {
+        public const string CurrentFileNameKey = "$(currentFilename)";
+
+        /// <summary>
+        /// Replaces special macros in a regex list.
+        /// </summary>
+        /// <param name="precedenceRegexes"></param>
+        /// <param name="documentName">Name of the current document without extension.</param>
+        /// <returns></returns>
+        public static string[] FixupRegexes(string[] precedenceRegexes, string documentName)
+        {
+            string[] regexes = new string[precedenceRegexes.Length];
+            for (int i = 0; i < precedenceRegexes.Length; ++i)
+            {
+                regexes[i] = precedenceRegexes[i].Replace(CurrentFileNameKey, documentName);
+            }
+            return regexes;
+        }
+    }
+}

IncludeToolbox/TryAndErrorRemoval.cs

@@ -7,6 +7,7 @@
 using EnvDTE;
 using Microsoft.VisualStudio.Text;
 using System.Collections.Generic;
+using System.IO;
 
 namespace IncludeToolbox
 {
@@ -97,8 +98,12 @@ public void PerformTryAndErrorRemoval(EnvDTE.Document document, TryAndErrorRemov
                 if (settings.IgnoreFirstInclude)
                     includeLines = includeLines.Skip(1);
                 // Apply filter ignore regex.
-                includeLines = includeLines.Where(line => !settings.IgnoreList.Any(regexPattern => 
-                                                 new System.Text.RegularExpressions.Regex(regexPattern).Match(line.IncludeContent).Success));
+                {
+                    string documentName = Path.GetFileNameWithoutExtension(document.FullName);
+                    string[] ignoreRegexList = RegexUtils.FixupRegexes(settings.IgnoreList, documentName);
+                    includeLines = includeLines.Where(line => !ignoreRegexList.Any(regexPattern =>
+                                                     new System.Text.RegularExpressions.Regex(regexPattern).Match(line.IncludeContent).Success));
+                }
                 // Reverse order if necessary.
                 if (settings.RemovalOrder == TryAndErrorRemovalOptionsPage.IncludeRemovalOrder.BottomToTop)
                     includeLines = includeLines.Reverse();