Prevented incorrect parse for to be escaped characters as literals

Author: Vogel612

Rubberduck.RegexAssistant/Atom.cs

@@ -142,7 +142,7 @@ public override bool Equals(object obj)
 
     class Literal : IAtom
     {
-        public static readonly string Pattern = @"(?<expression>\\(u[\dA-F]{4}|x[\dA-F]{2}|[0-7]{3}|[bB\(\){}\\\[\]\.+*?1-9nftvrdDwWsS])|[^()\[\]{}\\*+?])";
+        public static readonly string Pattern = @"(?<expression>\\(u[\dA-F]{4}|x[\dA-F]{2}|[0-7]{3}|[bB\(\){}\\\[\]\.+*?1-9nftvrdDwWsS])|[^()\[\]{}\\*+?^$])";
         private static readonly Regex Matcher = new Regex("^" + Pattern + "$");
         private static readonly ISet<char> EscapeLiterals = new HashSet<char>();
         private readonly string _specifier;

Rubberduck.RegexAssistant/Tests/LiteralTests.cs

@@ -56,7 +56,7 @@ public void SimpleLiterals()
         public void EverythingElseBlowsUp()
         {
             char[] allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!\"§%&/=ß#'°".ToCharArray();
-            string[] allowedEscapes = { "(", ")", "{", "}", "[", "]", ".", "?", "+", "*", "uFFFF", "u0000", "xFF", "x00", "777", "000" };
+            string[] allowedEscapes = { "(", ")", "{", "}", "[", "]", ".", "?", "+", "*", "$", "^", "uFFFF", "u0000", "xFF", "x00", "777", "000" };
             foreach (string blowup in allowedEscapes.Select(e => "\\"+ e).Concat(allowed.Select(c => ""+c)))
             {
                 try
@@ -71,5 +71,25 @@ public void EverythingElseBlowsUp()
                 Assert.Fail("Did not blow up when trying to parse {0} as literal", blowup);
             }
         }
+
+        [TestMethod]
+        public void SingleEscapedCharsAreNotParsedAsLiteral()
+        {
+            string[] escapedChars = "(){}[]\\*?+$^".ToCharArray().Select(e => e.ToString()).ToArray();
+            foreach (var escape in escapedChars)
+            {
+                try
+                {
+                    Literal cut = new Literal(escape);
+                }
+                catch (ArgumentException ex)
+                {
+                    Assert.IsTrue(true); // Assert.Pass();
+                    continue;
+                }
+                Assert.Fail("Did not blow up when trying to parse {0} as literal", escape);
+            }
+
+        }
     }
 }