Fix default substitution values

tree-sitter-grammars · Nov 21, 2023 · 9725327 · 9725327
1 parent e3cc585
commit 9725327
Show file tree

Hide file tree

Showing 5 changed files with 865 additions and 950 deletions.
diff --git a/grammar.js b/grammar.js
@@ -53,20 +53,24 @@ module.exports = grammar({
 
     substitution: $ => seq(
       '${',
-      $._content,
-      optional($._default),
-      '}'
-    ),
-
-    _content: $ => repeat1(
-      choice(
+      repeat1(choice(
         $.key,
         $.substitution
-      )
+      )),
+      optional($._default),
+      '}'
     ),
 
     _default: $ => seq(
-      ':', field('default', $._content)
+      ':',
+      field(
+        'default',
+        repeat1(choice(
+          $._char,
+          $.escape,
+          $.substitution
+        )),
+      )
     ),
 
     escape: _ => choice(

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json