Better syntax highlighting for fmt strings

noir-lang · Jan 9, 2025 · 0f6a8e6 · 0f6a8e6
1 parent a2d583f
commit 0f6a8e6
Showing 1 changed file with 42 additions and 7 deletions.
diff --git a/syntaxes/noir.tmLanguage.json b/syntaxes/noir.tmLanguage.json
@@ -51,17 +51,52 @@
       ]
     },
     "strings": {
-      "name": "string.quoted.double.nr",
-      "begin": "\"",
-      "end": "\"",
-      "patterns": [{
-        "include": "#escapes"
-      }]
+      "patterns": [
+        {
+          "name": "string.quoted.double.nr",
+          "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#string-escapes"
+            }
+          ]
+        },
+        {
+          "name": "string.interpolated.nr",
+          "begin": "f\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#interpolated-string-escapes"
+            },
+            {
+              "include": "#interpolations"
+            }
+          ]
+        }
+      ]
     },
-    "escapes": {
+    "string-escapes": {
       "name": "constant.character.escape.nr",
       "match": "\\\\."
     },
+    "interpolated-string-escapes": {
+      "name": "constant.character.escape.nr",
+      "match": "\\\\.|{{|}}"
+    },
+    "interpolations": {
+      "match": "({)[^\"{}]*(})",
+      "name": "variable.other.nr",
+      "captures": {
+        "1": {
+          "name": "constant.character.nr"
+        },
+        "2": {
+          "name": "constant.character.nr"
+        }
+      }
+    },
     "numeric": {
       "patterns": [
         {