Add token type to debug print.

Author: cristianoc

analysis/src/SemanticTokens.ml

@@ -12,6 +12,12 @@ module Token = struct
     | Type -> "2"
     | Module -> "3"
 
+  let tokenTypeDebug = function
+    | Keyword -> "Keyword"
+    | Variable -> "Variable"
+    | Type -> "Type"
+    | Module -> "Module"
+
   let tokenModifiersToString = function NoModifier -> "0"
 
   type token = int * int * int * tokenType * tokenModifiers
@@ -91,18 +97,18 @@ let emitLongident ?(backwards = false) ?(jsx = false)
   let rec loop pos segments =
     match segments with
     | [id] when isUppercaseId id || isLowercaseId id ->
-      if debug then Printf.printf "Lident: %s %s\n" id (posToString pos);
-      emitter
-      |> emitFromPos pos
-           (fst pos, snd pos + String.length id)
-           ~type_:(if isUppercaseId id then moduleToken else Variable)
+      let type_ = if isUppercaseId id then moduleToken else Variable in
+      if debug then
+        Printf.printf "Lident: %s %s %s\n" id (posToString pos)
+          (Token.tokenTypeDebug type_);
+      emitter |> emitFromPos pos (fst pos, snd pos + String.length id) ~type_
     | id :: segments when isUppercaseId id || isLowercaseId id ->
-      if debug then Printf.printf "Ldot: %s %s\n" id (posToString pos);
+      let type_ = if isUppercaseId id then moduleToken else Variable in
+      if debug then
+        Printf.printf "Ldot: %s %s %s\n" id (posToString pos)
+          (Token.tokenTypeDebug type_);
       let length = String.length id in
-      emitter
-      |> emitFromPos pos
-           (fst pos, snd pos + length)
-           ~type_:(if isUppercaseId id then moduleToken else Variable);
+      emitter |> emitFromPos pos (fst pos, snd pos + length) ~type_;
       loop (fst pos, snd pos + length + 1) segments
     | _ -> ()
   in

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

@@ -1,28 +1,28 @@
 Parse tests/src/Parser.res
 structure items:15 diagnostics:0 
-Lident: M (0,7)
-Lident: C (1,9)
-Lident: Component (1,13)
-Lident: Component (4,10)
-Lident: _c (4,4)
-Ldot: M (6,11)
-Lident: C (6,13)
-Lident: _mc (6,4)
-Lident: div (8,10)
-Lident: _d (8,4)
-Lident: div (11,3)
-Lident: div (16,4)
-Ldot: React (12,5)
-Lident: string (12,11)
-Lident: div (13,5)
-Lident: div (13,34)
-Ldot: React (13,11)
-Lident: string (13,17)
-Ldot: React (14,5)
-Lident: string (14,11)
-Ldot: React (15,5)
-Lident: string (15,11)
-Lident: _d2 (10,4)
+Lident: M (0,7) Module
+Lident: C (1,9) Module
+Lident: Component (1,13) Module
+Lident: Component (4,10) Module
+Lident: _c (4,4) Variable
+Ldot: M (6,11) Module
+Lident: C (6,13) Module
+Lident: _mc (6,4) Variable
+Lident: div (8,10) Variable
+Lident: _d (8,4) Variable
+Lident: div (11,3) Variable
+Lident: div (16,4) Variable
+Ldot: React (12,5) Module
+Lident: string (12,11) Variable
+Lident: div (13,5) Variable
+Lident: div (13,34) Variable
+Ldot: React (13,11) Module
+Lident: string (13,17) Variable
+Ldot: React (14,5) Module
+Lident: string (14,11) Variable
+Ldot: React (15,5) Module
+Lident: string (15,11) Variable
+Lident: _d2 (10,4) Variable
 Type: pair (18,5)->(18,9)
 Type: looooooooooooooooooooooooooooooooooooooong_int (20,5)->(20,51)
 Type: int (20,54)->(20,57)
@@ -39,17 +39,17 @@ Type: looooooooooooooooooooooooooooooooooooooong_string (27,4)->(27,53)
 BinaryExp: (31,14)->(31,16)
 BinaryExp: (31,10)->(31,11)
 BinaryExp: (31,19)->(31,20)
-Lident: MT (33,12)
-Lident: DDF (34,9)
-Lident: DDF (39,7)
-Lident: MT (39,12)
-Lident: DDF (40,9)
-Lident: XX (45,7)
-Lident: YY (46,9)
+Lident: MT (33,12) Type
+Lident: DDF (34,9) Module
+Lident: DDF (39,7) Module
+Lident: MT (39,12) Type
+Lident: DDF (40,9) Module
+Lident: XX (45,7) Module
+Lident: YY (46,9) Module
 Type: t (47,9)->(47,10)
 Type: int (47,13)->(47,16)
-Ldot: XX (51,5)
-Lident: YY (51,8)
+Ldot: XX (51,5) Module
+Lident: YY (51,8) Module
 Type: tt (53,5)->(53,7)
 Type: t (53,10)->(53,11)