syntax: Fix substitutions

Closes #112
terrastruct · Jul 13, 2023 · 773dc96 · 773dc96
1 parent 94b53fe
commit 773dc96
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/syntaxes/d2.tmLanguage.json b/syntaxes/d2.tmLanguage.json
@@ -9,15 +9,15 @@
     {
       "include": "#semicolon"
     },
-    {
-      "include": "#key_value"
-    },
     {
       "include": "#spread_substitution"
     },
     {
       "include": "#spread_import"
     },
+    {
+      "include": "#key_value"
+    },
     {
       "include": "#key"
     },
@@ -356,8 +356,8 @@
           "name": "keyword.operator.substitution.d2"
         }
       },
-      "begin": "\\$",
-      "end": "(?=\\s*[\\n#;\\[\\]{}|$])",
+      "begin": "\\$\\{",
+      "end": "}(?=\\s*[\\n#;\\[\\]{}|$])",
       "patterns": [
         {
           "include": "#key"
@@ -386,8 +386,8 @@
           "name": "keyword.operator.substitution.d2"
         }
       },
-      "begin": "\\.\\.\\.\\$",
-      "end": "(?=\\s*[\\n#;\\[\\]{}|$])",
+      "begin": "\\.\\.\\.\\$\\{",
+      "end": "}(?=\\s*[\\n#;\\[\\]{}|$])",
       "patterns": [
         {
           "include": "#key"
@@ -425,6 +425,9 @@
         {
           "include": "#semicolon"
         },
+        {
+          "include": "#substitution"
+        },
         {
           "include": "#import"
         },

diff --git a/syntaxes/d2.tmLanguage.yaml b/syntaxes/d2.tmLanguage.yaml
@@ -30,9 +30,9 @@ patterns:
   # - include: '#debug'
   - include: "#comment"
   - include: "#semicolon"
-  - include: "#key_value"
   - include: "#spread_substitution"
   - include: "#spread_import"
+  - include: "#key_value"
   - include: "#key"
   - include: "#error"
 repository:
@@ -186,8 +186,8 @@ repository:
   substitution:
     name: meta.operator.substitution.d2
     captures: { 0: { name: keyword.operator.substitution.d2 } }
-    begin: '\$'
-    end: '(?=\s*[\n#;\[\]{}|$])'
+    begin: '\$\{'
+    end: '}(?=\s*[\n#;\[\]{}|$])'
     patterns:
       - include: "#key"
   import:
@@ -200,8 +200,8 @@ repository:
   spread_substitution:
     name: meta.operator.substitution.d2
     captures: { 0: { name: keyword.operator.substitution.d2 } }
-    begin: '\.\.\.\$'
-    end: '(?=\s*[\n#;\[\]{}|$])'
+    begin: '\.\.\.\$\{'
+    end: '}(?=\s*[\n#;\[\]{}|$])'
     patterns:
       - include: "#key"
   spread_import:
@@ -219,6 +219,7 @@ repository:
     patterns:
       - include: "#comment"
       - include: "#semicolon"
+      - include: "#substitution"
       - include: "#import"
       - include: "#spread_substitution"
       - include: "#spread_import"