Fix true/false.

Don't emit semantic tokens for true/false.
Remove redundant parts of grammar that were overriding booleans.

Author: cristianoc

analysis/src/SemanticTokens.ml

@@ -277,6 +277,9 @@ let parser ~debug ~emitter ~path =
     | Pexp_field (_, label) | Pexp_setfield (_, label, _) ->
       emitter |> emitRecordLabel ~label ~debug;
       Ast_mapper.default_mapper.expr mapper e
+    | Pexp_construct ({txt = Lident ("true" | "false")}, _) ->
+      (* Don't emit true or false *)
+      Ast_mapper.default_mapper.expr mapper e
     | Pexp_construct (name, _) ->
       emitter |> emitVariant ~name ~debug;
       Ast_mapper.default_mapper.expr mapper e

analysis/tests/src/Parser.res

@@ -83,3 +83,5 @@ module SomeComponent = {
 }
 
 let _ = <SomeComponent.Nested> <div /> </SomeComponent.Nested>
+
+let _ = true

analysis/tests/src/expected/Parser.res.txt

@@ -1,5 +1,5 @@
 Parse tests/src/Parser.res
-structure items:22 diagnostics:0 
+structure items:23 diagnostics:0 
 Lident: M (0,7) Namespace
 Lident: C (1,9) Namespace
 Lident: Component (1,13) Namespace

grammars/rescript.tmLanguage.json

@@ -15,7 +15,7 @@
     },
     "RE_KEYWORDS": {
       "name": "keyword.control",
-      "match": "\\b(and|as|assert|constraint|downto|else|exception|external|false|for|if|in|include|lazy|module|mutable|of|open|rec|switch|to|true|try|type|when|while|with)\\b"
+      "match": "\\b(and|as|assert|constraint|downto|else|exception|external|for|if|in|include|lazy|module|mutable|of|open|rec|switch|to|try|type|when|while|with)\\b"
     },
     "RE_CONSTANTS_BOOL": {
       "name": "constant.language.boolean",
@@ -25,10 +25,6 @@
       "name": "keyword",
       "match": "\\b(let)\\b"
     },
-    "RE_LITERAL": {
-      "name": "constant.language",
-      "match": "\\b(true|false)\\b"
-    },
     "commentLine": {
       "match": "//.*",
       "name": "comment.line"
@@ -107,9 +103,6 @@
     },
     "constant": {
       "patterns": [
-        {
-          "include": "#RE_LITERAL"
-        },
         {
           "include": "#RE_CONSTANTS_BOOL"
         }