Update grammar for poly variants, and semantic analysis for types #...someType.

- #foo is marked as enum
- space is allowed: # foo
- #...foo. is a type

Author: cristianoc

analysis/src/SemanticTokens.ml

@@ -216,6 +216,9 @@ let parser ~debug ~emitter ~path =
     | Ppat_construct (name, _) ->
       emitter |> emitVariant ~name ~debug;
       Ast_mapper.default_mapper.pat mapper p
+    | Ppat_type {txt = lid; loc} ->
+      emitter |> emitType ~lid ~debug ~loc;
+      Ast_mapper.default_mapper.pat mapper p
     | _ -> Ast_mapper.default_mapper.pat mapper p
   in
   let expr (mapper : Ast_mapper.mapper) (e : Parsetree.expression) =

analysis/tests/src/Parser.res

@@ -111,3 +111,18 @@ let _ = \"true"
 let enumInModule = T.A
 
 type typeInModule = XX.YY.t
+
+module QQ = {
+  type somePolyEnumType = [
+    | #someMember
+    | #AnotherMember
+    | #SomeMemberWithPayload(list<int>)
+    | #"fourth Member"
+  ]
+}
+
+let _ = x =>
+  switch x {
+  | #stuff => 3
+  | #...QQ.somePolyEnumType => 4
+  }

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

@@ -1,5 +1,5 @@
 Parse tests/src/Parser.res
-structure items:33 diagnostics:0 
+structure items:35 diagnostics:0 
 Lident: M (0,7) Namespace
 Lident: C (1,9) Namespace
 Lident: Component (1,13) Namespace
@@ -130,4 +130,13 @@ Lident: typeInModule (112,5) Type
 Ldot: XX (112,20) Namespace
 Ldot: YY (112,23) Namespace
 Lident: t (112,26) Type
+Lident: QQ (114,7) Namespace
+Lident: somePolyEnumType (115,7) Type
+Lident: list (118,29) Type
+TypeArg: (118,34)->(118,37)
+Lident: int (118,34) Type
+Ldot: QQ (126,8) Namespace
+Lident: somePolyEnumType (126,11) Type
+Lident: x (124,9) Variable
+Variable: x (123,8)->(123,9)
 

grammars/rescript.tmLanguage.json

@@ -270,24 +270,32 @@
           "name": "variable.function variable.other"
         },
         {
-          "match": "(#)(\\.\\.\\.)?([a-zA-Z][0-9a-zA-Z_]*)\\b",
+          "match": "(#)\\s*([a-zA-Z][0-9a-zA-Z_]*)\\b",
           "captures": {
             "1": {
-              "name": "punctuation.definition.keyword"
+              "name": "variable.other.enummember"
             },
             "2": {
-              "name": "punctuation.definition.keyword"
+              "name": "variable.other.enummember"
+            }
+          }
+        },
+        {
+          "match": "(#)\\s*(\\.\\.\\.)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.other.enummember"
             },
-            "3": {
-              "name": "variable.function variable.other"
+            "2": {
+              "name": "variable.other.enummember"
             }
           }
         },
         {
           "match": "(#)",
           "captures": {
             "1": {
-              "name": "punctuation.definition.keyword"
+              "name": "variable.other.enummember"
             }
           }
         }