From 16d9956a0031819879d9ef959b8fbbb99d8ac8c2 Mon Sep 17 00:00:00 2001
From: Ary Borenszweig <asterite@gmail.com>
Date: Thu, 9 Jan 2025 15:00:28 -0300
Subject: [PATCH] feat: better syntax highlighting for strings (#95)

---
 syntaxes/noir.tmLanguage.json | 60 +++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/syntaxes/noir.tmLanguage.json b/syntaxes/noir.tmLanguage.json
index 7748ada..60d8521 100644
--- a/syntaxes/noir.tmLanguage.json
+++ b/syntaxes/noir.tmLanguage.json
@@ -51,16 +51,64 @@
       ]
     },
     "strings": {
-      "name": "string.quoted.double.nr",
-      "match": "\"(.*?)(\n|(?<!\\\\)\")",
-      "captures": {
-        "1": {
+      "patterns": [
+        {
+          "name": "string.quoted.double.nr",
+          "begin": "\"",
+          "end": "\"",
           "patterns": [
             {
-              "name": "constant.character.escape.nr",
-              "match": "\\\\."
+              "include": "#string-escapes"
             }
           ]
+        },
+        {
+          "name": "string.quoted.double.nr",
+          "begin": "r(#*)\"",
+          "end": "\"(\\1)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.byte.raw.nr"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "string.quoted.byte.raw.nr"
+            }
+          }
+        },
+        {
+          "name": "string.interpolated.nr",
+          "begin": "f\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#interpolated-string-escapes"
+            },
+            {
+              "include": "#interpolations"
+            }
+          ]
+        }
+      ]
+    },
+    "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"
         }
       }
     },