feat(grammar): concrete keyword aliases

rydesun · Aug 24, 2022 · 07e91a1 · 07e91a1
1 parent 9172307
commit 07e91a1
Show file tree

Hide file tree

Showing 9 changed files with 1,678 additions and 1,617 deletions.
diff --git a/grammar.js b/grammar.js
@@ -12,12 +12,12 @@ module.exports = grammar({
   rules: {
     source_file: $ => seq(
       optional(
-        alias(ignoreCase('strict'), $.keyword),
+        alias(ignoreCase('strict'), 'strict'),
+      ),
+      choice(
+        alias(ignoreCase('graph'), 'graph'),
+        alias(ignoreCase('digraph'), 'digraph'),
       ),
-      field('type', choice(
-        alias(ignoreCase('graph'), $.keyword),
-        alias(ignoreCase('digraph'), $.keyword),
-      )),
       optional(field('id', $.id)),
       field('block', $.block),
     ),
@@ -46,7 +46,7 @@ module.exports = grammar({
     subgraph: $ => seq(
       optional(
         seq(
-          alias(ignoreCase('subgraph'), $.keyword),
+          alias(ignoreCase('subgraph'), 'subgraph'),
           optional(field('id', $.id)),
         ),
       ),
@@ -77,9 +77,9 @@ module.exports = grammar({
 
     attr_stmt: $ => seq(
       choice(
-        alias(ignoreCase('graph'), $.keyword),
-        alias(ignoreCase('node'), $.keyword),
-        alias(ignoreCase('edge'), $.keyword),
+        alias(ignoreCase('graph'), 'graph'),
+        alias(ignoreCase('node'), 'node'),
+        alias(ignoreCase('edge'), 'edge'),
       ),
       $.attr_list,
     ),

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -1,4 +1,11 @@
-(keyword) @keyword
+[
+  "strict"
+  "graph"
+  "digraph"
+  "subgraph"
+  "node"
+  "edge"
+] @keyword
 (string_literal) @string
 (number_literal) @number
 

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