Explore type based autocomplete

.vscode/settings.json

@@ -5,5 +5,9 @@
 	"typescript.preferences.quoteStyle": "single",
 	"editor.codeActionsOnSave": {
 		"source.fixAll.eslint": true
+	},
+	"ocaml.sandbox": {
+		"kind": "opam",
+		"switch": "4.12.1"
 	}
 }

analysis/src/Cli.ml

@@ -3,7 +3,7 @@ let help =
 **Private CLI For rescript-vscode usage only**
 
 API examples:
-  ./rescript-editor-analysis.exe completion src/MyFile.res 0 4 currentContent.res
+  ./rescript-editor-analysis.exe completion src/MyFile.res 0 4 currentContent.res true
   ./rescript-editor-analysis.exe definition src/MyFile.res 9 3
   ./rescript-editor-analysis.exe typeDefinition src/MyFile.res 9 3
   ./rescript-editor-analysis.exe documentSymbol src/Foo.res
@@ -24,8 +24,9 @@ https://microsoft.github.io/language-server-protocol/specification#position
 Options:
   completion: compute autocomplete for MyFile.res at line 0 and column 4,
     where MyFile.res is being edited and the editor content is in file current.res.
+    The final boolean indicates whether the completion should return snippets or not.
 
-    ./rescript-editor-analysis.exe completion src/MyFile.res 0 4 current.res
+    ./rescript-editor-analysis.exe completion src/MyFile.res 0 4 current.res true
 
   definition: get definition for item in MyFile.res at line 10 column 2:
 
@@ -82,10 +83,14 @@ Options:
 
 let main () =
   match Array.to_list Sys.argv with
-  | [_; "completion"; path; line; col; currentFile] ->
+  | [_; "completion"; path; line; col; currentFile; supportsSnippets] ->
     Commands.completion ~debug:false ~path
       ~pos:(int_of_string line, int_of_string col)
       ~currentFile
+      ~supportsSnippets:
+        (match supportsSnippets with
+        | "true" -> true
+        | _ -> false)
   | [_; "definition"; path; line; col] ->
     Commands.definition ~path
       ~pos:(int_of_string line, int_of_string col)

analysis/src/Commands.ml

@@ -21,10 +21,18 @@ let getCompletions ~debug ~path ~pos ~currentFile ~forHover =
         |> CompletionBackEnd.processCompletable ~debug ~package ~pos ~scope ~env
              ~forHover))
 
-let completion ~debug ~path ~pos ~currentFile =
+let completion ~debug ~path ~pos ~currentFile ~supportsSnippets =
   print_endline
     (getCompletions ~debug ~path ~pos ~currentFile ~forHover:false
     |> List.map CompletionBackEnd.completionToItem
+    |> List.map (fun completionItem ->
+           if supportsSnippets then completionItem
+           else
+             {
+               completionItem with
+               Protocol.insertText = None;
+               insertTextFormat = None;
+             })
     |> List.map Protocol.stringifyCompletionItem
     |> Protocol.array)
 
@@ -320,7 +328,8 @@ let test ~path =
               ("Complete " ^ path ^ " " ^ string_of_int line ^ ":"
              ^ string_of_int col);
             let currentFile = createCurrentFile () in
-            completion ~debug:true ~path ~pos:(line, col) ~currentFile;
+            completion ~debug:true ~path ~pos:(line, col) ~currentFile
+              ~supportsSnippets:true;
             Sys.remove currentFile
           | "dce" ->
             print_endline ("DCE " ^ path);
@@ -390,14 +399,24 @@ let test ~path =
                                    (Protocol.stringifyRange range)
                                    indent indent newText)))
           | "dia" -> diagnosticSyntax ~path
-          | "hin" -> (
+          | "hin" ->
             let line_start = 0 in
             let line_end = 6 in
-            print_endline ("Inlay Hint " ^ path ^ " " ^ string_of_int line_start ^ ":" ^ string_of_int line_end);
-            inlayhint ~path ~pos:(line_start, line_end) ~maxLength:"25" ~debug:false)
+            print_endline
+              ("Inlay Hint " ^ path ^ " " ^ string_of_int line_start ^ ":"
+             ^ string_of_int line_end);
+            inlayhint ~path ~pos:(line_start, line_end) ~maxLength:"25"
+              ~debug:false
           | "cle" ->
             print_endline ("Code Lens " ^ path);
             codeLens ~path ~debug:false
+          | "ast" ->
+            print_endline
+              ("Dump AST " ^ path ^ " " ^ string_of_int line ^ ":"
+             ^ string_of_int col);
+            let currentFile = createCurrentFile () in
+            DumpAst.dump ~pos:(line, col) ~currentFile;
+            Sys.remove currentFile
           | _ -> ());
           print_newline ())
     in