From f411aa7433d106bdf061b890b3b91f2dcceeafd7 Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Wed, 4 Mar 2026 17:50:58 +0100
Subject: [PATCH] Add string highlighting with DarkYellow and make sure
 variable coloring gets applied before others

---
 YesNt.CodeEditor/SyntaxHighlighter.cs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/YesNt.CodeEditor/SyntaxHighlighter.cs b/YesNt.CodeEditor/SyntaxHighlighter.cs
index 57b9bd2..2c8a3e7 100644
--- a/YesNt.CodeEditor/SyntaxHighlighter.cs
+++ b/YesNt.CodeEditor/SyntaxHighlighter.cs
@@ -36,6 +36,19 @@ internal partial class SyntaxHighlighter(ReadOnlyCollection<StatementInformation
         }
         else
         {
+
+            MatchCollection matches = VariableRegex().Matches(input);
+            for (int i = 0; i < matches.Count; i++)
+            {
+                input = AddColorInformation(input, matches[i].Value, ConsoleColor.Cyan, SearchMode.Contains);
+            }
+
+            matches = StringRegex().Matches(input);
+            for (int i = 0; i < matches.Count; i++)
+            {
+                input = AddColorInformation(input, matches[i].Value, ConsoleColor.DarkYellow, SearchMode.Contains);
+            }
+
             for (int i = 0; i < replacementValues.Length; i++)
             {
                 input = AddColorInformation(input, replacementValues[i], ConsoleColor.Blue, SearchMode.Contains);
@@ -105,12 +118,6 @@ internal partial class SyntaxHighlighter(ReadOnlyCollection<StatementInformation
                     input = AddColorInformation(input, input, statement.Color, statement.SearchMode);
                 }
             }
-
-            MatchCollection matches = VariableRegex().Matches(input);
-            for (int i = 0; i < matches.Count; i++)
-            {
-                input = AddColorInformation(input, matches[i].Value, ConsoleColor.Cyan, SearchMode.Contains);
-            }
         }
 
         foreach (string part in input.Split("\0"))
@@ -158,6 +165,11 @@ internal partial class SyntaxHighlighter(ReadOnlyCollection<StatementInformation
     [GeneratedRegex("\\$\\{[a-zA-Z0-9]+\\}")]
     private static partial Regex VariableRegex();
 
+    // match all double quote pairs
+
+    [GeneratedRegex(@"(?<!\\)(?:\\\\{2})*""(?:\\.|[^""\\])*""")]
+    private static partial Regex StringRegex();
+
     [GeneratedRegex("(?<=(\\v))(.*)(?=\\v)")]
     private static partial Regex StringColorRegex();
 }