Use Regex.Unescape() to escape literal strings

smoogipoo · Aug 1, 2024 · 60826f7 · 60826f7
1 parent da53476
commit 60826f7
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/LocalisationAnalyser.Tools/Php/PhpStringLiteralSyntaxNode.cs b/LocalisationAnalyser.Tools/Php/PhpStringLiteralSyntaxNode.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace LocalisationAnalyser.Tools.Php
 {
@@ -22,33 +23,25 @@ public static PhpStringLiteralSyntaxNode Parse(PhpTokeniser tokeniser)
             tokeniser.SkipWhitespace();
 
             char trivia = tokeniser.GetTrivia();
-
-            // Skip leading trivia.
             tokeniser.Advance();
 
             var stringBuilder = new StringBuilder();
-            bool isEscaping = false;
+            char? lastToken = null;
 
-            while (isEscaping || tokeniser.GetTrivia() != trivia)
+            while (tokeniser.GetTrivia() != trivia || lastToken == '\\')
             {
-                var token = tokeniser.GetTrivia();
+                char token = tokeniser.GetTrivia();
                 tokeniser.Advance();
 
-                if (token == '\\' && !isEscaping)
-                {
-                    isEscaping = true;
-                    continue;
-                }
-
                 stringBuilder.Append(token);
-                isEscaping = false;
+                lastToken = token;
             }
 
             // Skip trailing trivia.
             tokeniser.Advance();
             tokeniser.SkipWhitespace();
 
-            return new PhpStringLiteralSyntaxNode(stringBuilder.ToString());
+            return new PhpStringLiteralSyntaxNode(Regex.Unescape(stringBuilder.ToString()));
         }
     }
 }