Merge #6275

6275: Textmate grammar: prevent unwanted interpolation scopes r=matklad a=dustypomerleau

Fixes the issues noted by @matklad after merging #6248. 

1. prevent accidental interpolation scopes when `{` is used in a string
1. prevent interpolations from extending beyond the end of a string

Co-authored-by: Dusty Pomerleau <[email protected]>

1 files changed, 6 insertions, 14 deletions

diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index 66c8843f4..18fad6288 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -694,23 +694,15 @@
         "interpolations": {
             "comment": "curly brace interpolations",
             "name": "meta.interpolation.rust",
-            "begin": "{",
-            "beginCaptures": {
-                "0": {
+            "match": "({)[^\"{}]*(})",
+            "captures": {
+                "1": {
                     "name": "punctuation.definition.interpolation.rust"
-                }
-            },
-            "end": "}",
-            "endCaptures": {
-                "0": {
+                },
+                "2": {
                     "name": "punctuation.definition.interpolation.rust"
                 }
-            },
-            "patterns": [
-                {
-                    "include": "#interpolations"
-                }
-            ]
+            }
         },
         "lifetimes": {
             "patterns": [