grammar: fix missing format related edge-cases

open-goal · Jan 28, 2024 · 8fba8c3 · 8fba8c3
1 parent e51d151
commit 8fba8c3
Show file tree

Hide file tree

Showing 6 changed files with 922 additions and 838 deletions.
diff --git a/grammar.js b/grammar.js
@@ -202,10 +202,11 @@ module.exports = grammar({
       /[\[\]]/,
       /[<>]/,
       ';',
+      '`',
       seq(field('numberOfArgs', $._format_token), '*'),
       '?',
       "Newline",
-      seq(repeat(choice($._format_token, ',')), /[$rRbBdDgGxXeEoOsStTfF]/),
+      seq(repeat(choice($._format_token, ',')), /[$mrRbBdDgGxXeEoOsStTfF]/),
     ),
     format_specifier: $ =>
       prec.left(seq(

diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "gen": "yarn tree-sitter generate",
     "test": "yarn tree-sitter test",
-    "parse-sample": "yarn tree-sitter parse test/samples/sample.gc",
-    "parse-test": "yarn tree-sitter parse test/samples/test.gc"
+    "parse-sample": "yarn gen && yarn tree-sitter parse test/samples/sample.gc",
+    "parse-test": "yarn gen && yarn tree-sitter parse test/samples/test.gc"
   },
   "repository": {
     "type": "git",

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