Add Backslash Escape Syntax Highlighting

Still working on keeping function parameters from turning red...
joelday · Feb 20, 2023 · 06cfb6b · 06cfb6b
1 parent 49e8ad1
commit 06cfb6b
Showing 1 changed file with 32 additions and 3 deletions.
diff --git a/src/papyrus-lang-vscode/syntaxes/papyrus/papyrus.tmLanguage b/src/papyrus-lang-vscode/syntaxes/papyrus/papyrus.tmLanguage
@@ -84,7 +84,7 @@
                 </dict>
                 <dict>
                     <key>match</key>
-                    <string>(?i)(conditional|default|hidden|native|const)</string>
+                    <string>(?i)(?:\s+|(?&lt;=/;))(conditional|default|hidden|native|const)(?=\s|;|$)</string>
                     <key>name</key>
                     <string>keyword.language.script-flag.papyrus</string>
                 </dict>
@@ -335,6 +335,10 @@
             <key>include</key>
             <string>#builtin-funcs</string>
         </dict>
+        <dict>
+            <key>include</key>
+            <string>#newline-escape</string>
+        </dict>
     </array>
     <key>repository</key>
     <dict>
@@ -371,12 +375,33 @@
         </dict>
         <key>quoted-string</key>
         <dict>
+            <key>name</key>
+            <string>string.quoted.double.papyrus</string>
             <key>begin</key>
             <string>&quot;</string>
             <key>end</key>
-            <string>&quot;</string>
+            <string>[&quot;\n]</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#string-character-escape</string>
+              </dict>
+            </array>
+        </dict>
+        <key>string-character-escape</key>
+        <dict>
             <key>name</key>
-            <string>string.quoted.double.papyrus</string>
+            <string>constant.character.escape.papyrus</string>
+            <key>match</key>
+            <string>\\[nt\\&quot;]?</string>
+        </dict>
+        <key>newline-escape</key>
+        <dict>
+            <key>match</key>
+            <string>\\(?=\s*\n)</string>
+            <key>name</key>
+            <string>constant.character.escape.papyrus</string>
         </dict>
         <key>params</key>
         <dict>
@@ -414,6 +439,10 @@
                     <key>name</key>
                     <string>meta.parameter.papyrus</string>
                 </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#newline-escape</string>
+                </dict>
                 <dict>
                     <key>match</key>
                     <string>[^\s\)]+?</string>