Clean up cli.

Author: cristianoc

analysis/src/Cli.ml

@@ -71,7 +71,7 @@ let main () =
   | _ :: "dump" :: files -> Commands.dump files
   | [_; "documentSymbol"; path] -> Commands.documentSymbol ~path
   | [_; "semanticTokens"; currentFile] ->
-    SemanticTokens.testCommand ~currentFile
+    SemanticTokens.semanticTokens ~currentFile
   | [_; "hover"; path; line; col] ->
     Commands.hover ~path ~line:(int_of_string line) ~col:(int_of_string col)
   | [_; "references"; path; line; col] ->

analysis/src/Commands.ml

@@ -347,9 +347,9 @@ let test ~path =
             close_out cout;
             completion ~path ~line ~col ~currentFile;
             Sys.remove currentFile
-          | "par" ->
-            print_endline ("Parse " ^ path);
-            SemanticTokens.parser ~debug:true
+          | "hig" ->
+            print_endline ("Highlight " ^ path);
+            SemanticTokens.command ~debug:true
               ~emitter:(SemanticTokens.Token.createEmitter ())
               ~path
           | _ -> ());

analysis/src/SemanticTokens.ml

@@ -208,7 +208,7 @@ let emitVariant ~(name : Longident.t Location.loc) ~debug emitter =
        ~pos:(Utils.tupleOfLexing name.loc.loc_start)
        ~lid:name.txt ~debug
 
-let parser ~debug ~emitter ~path =
+let command ~debug ~emitter ~path =
   let processTypeArg (coreType : Parsetree.core_type) =
     if debug then Printf.printf "TypeArg: %s\n" (locToString coreType.ptyp_loc)
   in
@@ -441,8 +441,7 @@ let parser ~debug ~emitter ~path =
         (List.length signature) (List.length diagnostics);
     mapper.signature mapper signature |> ignore
 
-let testCommand ~currentFile =
+let semanticTokens ~currentFile =
   let emitter = Token.createEmitter () in
-  parser ~emitter ~debug:false ~path:currentFile;
-  (* emitter |> Token.add ~line:0 ~char:0 ~length:3 ~type_:Token.Keyword; *)
+  command ~emitter ~debug:false ~path:currentFile;
   Printf.printf "{\"data\":[%s]}" (Token.emit emitter)

analysis/tests/src/Highlight.res

@@ -53,7 +53,7 @@ open XX.YY
 
 type tt = t
 
-// ^par
+// ^hig
 
 module T = {
   type someRecord<'typeParameter> = {

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

@@ -1,4 +1,4 @@
-Parse tests/src/Highlight.res
+Highlight tests/src/Highlight.res
 structure items:38 diagnostics:0 
 Lident: M (0,7) Class
 Lident: C (1,9) Class