update: remove unnecessary conflict

Solved the conflict by setting precedence.
tree-sitter-grammars · Jun 15, 2024 · c9012d6 · c9012d6
1 parent 088bcd4
commit c9012d6
Show file tree

Hide file tree

Showing 4 changed files with 509 additions and 583 deletions.
diff --git a/grammar.js b/grammar.js
@@ -3,10 +3,7 @@ module.exports = grammar({
 
   extras: ($) => [/[ \t]/, $.comment],
 
-  conflicts: ($) => [
-    [$._value, $.gradient],
-    [$.number, $.legacy_hex],
-  ],
+  conflicts: ($) => [[$.number, $.legacy_hex]],
 
   word: ($) => $.string,
 
@@ -56,12 +53,12 @@ module.exports = grammar({
         $.number,
         $.vec2,
         $.display,
-        $.color,
         $.gradient,
         $.mod,
         $.keys,
         $.string,
         $.variable,
+        prec(1, $.color),
         prec(1, $.position)
       ),
 

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