Merge branch 'master' into move-tools-to-ocaml

Author: aspeddro

.ocamlformat

@@ -1,5 +1,5 @@
 profile = default
-version = 0.22.4
+version = 0.26.1
 
 field-space = tight-decl
 break-cases = toplevel

CHANGELOG.md

@@ -12,10 +12,32 @@
 
 ## master
 
+#### :nail_care: Polish
+
+- More cases of not emitting `_` when completing in expressions. https://github.com/rescript-lang/rescript-vscode/pull/890
+
 #### :house: Internal
 
 - Move `rescript-tools` to OCaml code and make `analysis` an library. https://github.com/rescript-lang/rescript-vscode/pull/855
 
+## 1.34.0
+
+#### :rocket: New Feature
+
+- Complete domProps for lowercase JSX components from `ReactDOM.domProps` if possible. https://github.com/rescript-lang/rescript-vscode/pull/883
+- Complete for maker-style functions (functions returning type `t` of a module) when encountering a `type t` in relevant scenarios. https://github.com/rescript-lang/rescript-vscode/pull/884
+- Expand type aliases in hovers. https://github.com/rescript-lang/rescript-vscode/pull/881
+
+#### :bug: Bug Fix
+
+- Many bugfixes around nested pattern and expression completion. https://github.com/rescript-lang/rescript-vscode/pull/892
+
+#### :nail_care: Polish
+
+- Better error recovery when analysis fails. https://github.com/rescript-lang/rescript-vscode/pull/880
+- Do not emit `_` when completing in expressions. https://github.com/rescript-lang/rescript-vscode/pull/885
+- Include fields when completing a braced expr that's an ID, where it the path likely starts with a module. https://github.com/rescript-lang/rescript-vscode/pull/882
+
 ## 1.32.0
 
 #### :bug: Bug Fix

analysis.opam

@@ -7,6 +7,7 @@ homepage: "https://github.com/rescript-lang/rescript-vscode"
 bug-reports: "https://github.com/rescript-lang/rescript-vscode/issues"
 depends: [
   "ocaml" {>= "4.10"}
+  "ocamlformat" {= "0.26.1"}
   "cppo" {= "1.6.9"}
   "dune"
 ]

analysis/bin/main.ml

@@ -145,7 +145,14 @@ let main () =
       ~pos:(int_of_string line_start, int_of_string line_end)
       ~maxLength ~debug
   | [_; "codeLens"; path] -> Commands.codeLens ~path ~debug
-  | [_; "extractDocs"; path] -> DocExtraction.extractDocs ~path ~debug
+  | [_; "extractDocs"; path] -> 
+    let () =
+      match Sys.getenv_opt "FROM_COMPILER" with
+      | Some "true" -> Cfg.isDocGenFromCompiler := true
+      | _ -> ()
+    in
+
+    DocExtraction.extractDocs ~path ~debug
   | [_; "codeAction"; path; startLine; startCol; endLine; endCol; currentFile]
     ->
     Commands.codeAction ~path

analysis/src/Commands.ml

@@ -163,7 +163,7 @@ let references ~path ~pos ~debug =
   in
   print_endline
     (if allLocs = [] then Protocol.null
-    else "[\n" ^ (allLocs |> String.concat ",\n") ^ "\n]")
+     else "[\n" ^ (allLocs |> String.concat ",\n") ^ "\n]")
 
 let rename ~path ~pos ~newName ~debug =
   let result =
@@ -304,6 +304,8 @@ let test ~path =
           (match String.sub rest 0 3 with
           | "db+" -> Log.verbose := true
           | "db-" -> Log.verbose := false
+          | "dv+" -> Debug.debugLevel := Verbose
+          | "dv-" -> Debug.debugLevel := Off
           | "def" ->
             print_endline
               ("Definition " ^ path ^ " " ^ string_of_int line ^ ":"