Fix autocompletion in template expressions.

Makefile

@@ -9,6 +9,12 @@ clean:
 test:
 	make -C analysis test
 
+format:
+	make -C analysis format
+
+checkformat:
+	make -C analysis checkformat
+
 .DEFAULT_GOAL := build
 
 .PHONY: build clean test

analysis/Makefile

@@ -33,6 +33,9 @@ clean:
 	make -C tests clean
 	make -C reanalyze clean
 
+checkformat:
+	dune build @fmt
+
 .DEFAULT_GOAL := build
 
 .PHONY: build-analysis-binary build-reanalyze build-tests dce clean format test

analysis/dune-project

@@ -1,3 +1,13 @@
 (lang dune 2.0)
 
-(name rescript-vscode)
+(package
+ (name rescript-vscode)
+ (synopsis "ReScript vscode support")
+ (depends
+  (ocaml
+   (>= 4.10))
+  (ocamlformat
+   (= 0.22.4))
+  (reanalyze
+   (= 2.23.0))
+  dune))

analysis/reanalyze/src/EmitJson.ml

@@ -1,6 +1,6 @@
 let items = ref 0
 let start () = Printf.printf "["
-let finish ()= Printf.printf "\n]\n"
+let finish () = Printf.printf "\n]\n"
 let emitClose () = "\n}"
 
 let emitItem ~ppf ~name ~kind ~file ~range ~message =

analysis/reanalyze/src/Exception.ml

@@ -249,10 +249,7 @@ let traverseAst () =
            case.c_guard |> iterExprOpt self;
            case.c_rhs |> iterExpr self)
   in
-  let isRaise s =
-    s = "Pervasives.raise"
-    || s = "Pervasives.raise_notrace"
-  in
+  let isRaise s = s = "Pervasives.raise" || s = "Pervasives.raise_notrace" in
   let raiseArgs args =
     match args with
     | [(_, Some {Typedtree.exp_desc = Texp_construct ({txt}, _, _)})] ->

analysis/src/Cli.ml

@@ -93,8 +93,7 @@ let main () =
     Commands.codeAction ~path
       ~pos:(int_of_string line, int_of_string col)
       ~currentFile ~debug:false
-  | [_; "diagnosticSyntax"; path;] -> 
-    Commands.diagnosticSyntax ~path
+  | [_; "diagnosticSyntax"; path] -> Commands.diagnosticSyntax ~path
   | _ :: "reanalyze" :: _ ->
     let len = Array.length Sys.argv in
     for i = 1 to len - 2 do

analysis/src/Commands.ml

@@ -258,8 +258,7 @@ let format ~path =
   else ""
 
 let diagnosticSyntax ~path =
-  print_endline
-    (Diagnostics.document_syntax ~path |> Protocol.array)
+  print_endline (Diagnostics.document_syntax ~path |> Protocol.array)
 
 let test ~path =
   Uri.stripPath := true;

analysis/src/Diagnostics.ml

@@ -30,4 +30,4 @@ let document_syntax ~path =
       Res_driver.parsingEngine.parseInterface ~forPrinter:false ~filename:path
     in
     get_diagnostics parseInterface.diagnostics
-  else []
+  else []

analysis/src/Protocol.ml

@@ -10,16 +10,12 @@ type completionItem = {
   documentation: markupContent option;
 }
 
-type location = {uri : string; range : range}
-type documentSymbolItem = {name : string; kind : int; location : location}
-type renameFile = {oldUri : string; newUri : string}
-type textEdit = {range : range; newText : string}
-
-type diagnostic = {
-  range : range;
-  message : string;
-  severity : int;
-}
+type location = {uri: string; range: range}
+type documentSymbolItem = {name: string; kind: int; location: location}
+type renameFile = {oldUri: string; newUri: string}
+type textEdit = {range: range; newText: string}
+
+type diagnostic = {range: range; message: string; severity: int}
 
 type optionalVersionedTextDocumentIdentifier = {
   version: int option;
@@ -134,11 +130,11 @@ let stringifyCodeAction ca =
 
 (* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic *)
 let stringifyDiagnostic d =
-  Printf.sprintf {|{
+  Printf.sprintf
+    {|{
   "range": %s,
   "message": "%s",
   "severity": %d,
   "source": "ReScript"
 }|}
-    (stringifyRange d.range) (Json.escape d.message)
-    d.severity
+    (stringifyRange d.range) (Json.escape d.message) d.severity

analysis/tests/src/Completion.res

@@ -391,3 +391,17 @@ let _ = _ => {
   //        ^com
   ()
 }
+
+let red = "#ff0000"
+
+let header1 = `
+    color: ${red}; `
+//            ^com
+
+let header2 = `
+    color: ${red};
+    background-color: ${red}; `
+//                       ^com
+
+// let _ = `color: ${r    
+//                    ^com

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

@@ -937,9 +937,9 @@ Completable: Cpath Value[ForAuto, a]
 
 Complete src/Completion.res 234:34
 posCursor:[234:34] posNoWhite:[234:33] Found expr:[234:18->234:36]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[234:18->234:34], ...[234:34->234:36])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[234:18->234:34], ...[234:34->234:35])
 posCursor:[234:34] posNoWhite:[234:33] Found expr:[234:18->234:34]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[234:18->234:32], ...[234:32->234:34])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[234:18->234:30], ...[234:32->234:34])
 posCursor:[234:34] posNoWhite:[234:33] Found expr:[234:32->234:34]
 Pexp_ident na:[234:32->234:34]
 Completable: Cpath Value[na]
@@ -1434,9 +1434,9 @@ Completable: Cpath Value[AndThatOther, T]
 
 Complete src/Completion.res 378:24
 posCursor:[378:24] posNoWhite:[378:23] Found expr:[378:12->378:26]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[378:12->378:24], ...[378:24->378:26])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[378:12->378:24], ...[378:24->378:25])
 posCursor:[378:24] posNoWhite:[378:23] Found expr:[378:12->378:24]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[378:12->378:16], ...[378:16->378:24])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[378:12->378:14], ...[378:16->378:24])
 posCursor:[378:24] posNoWhite:[378:23] Found expr:[378:16->378:24]
 Pexp_ident ForAuto.:[378:16->378:24]
 Completable: Cpath Value[ForAuto, ""]
@@ -1456,9 +1456,9 @@ Completable: Cpath Value[ForAuto, ""]
 
 Complete src/Completion.res 381:38
 posCursor:[381:38] posNoWhite:[381:37] Found expr:[381:12->381:41]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[381:12->381:39], ...[381:39->381:41])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[381:12->381:39], ...[381:39->381:40])
 posCursor:[381:38] posNoWhite:[381:37] Found expr:[381:12->381:39]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[381:12->381:19], ...[381:19->381:39])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[381:12->381:17], ...[381:19->381:39])
 posCursor:[381:38] posNoWhite:[381:37] Found expr:[381:19->381:39]
 Pexp_send [381:38->381:38] e:[381:19->381:36]
 Completable: Cpath Value[FAO, forAutoObject][""]
@@ -1478,9 +1478,9 @@ Completable: Cpath Value[FAO, forAutoObject][""]
 
 Complete src/Completion.res 384:24
 posCursor:[384:24] posNoWhite:[384:23] Found expr:[384:11->384:26]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[384:11->384:24], ...[384:24->384:26])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[384:11->384:24], ...[384:24->384:25])
 posCursor:[384:24] posNoWhite:[384:23] Found expr:[384:11->384:24]
-Pexp_apply ...__ghost__[0:-1->0:-1] (...[384:11->384:14], ...[384:14->384:24])
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[384:11->384:12], ...[384:14->384:24])
 posCursor:[384:24] posNoWhite:[384:23] Found expr:[384:14->384:24]
 Pexp_field [384:14->384:23] _:[384:24->384:24]
 Completable: Cpath Value[funRecord].""
@@ -1518,3 +1518,63 @@ Completable: Cpath array->ma
     "documentation": null
   }]
 
+Complete src/Completion.res 397:14
+posCursor:[397:14] posNoWhite:[397:13] Found expr:[396:14->397:20]
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[396:14->397:16], ...[397:16->397:19])
+posCursor:[397:14] posNoWhite:[397:13] Found expr:[396:14->397:16]
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[396:14->397:11], ...[397:13->397:16])
+posCursor:[397:14] posNoWhite:[397:13] Found expr:[397:13->397:16]
+Pexp_ident red:[397:13->397:16]
+Completable: Cpath Value[red]
+[{
+    "label": "red",
+    "kind": 12,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete src/Completion.res 402:25
+posCursor:[402:25] posNoWhite:[402:24] Found expr:[400:14->402:31]
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[400:14->402:27], ...[402:27->402:30])
+posCursor:[402:25] posNoWhite:[402:24] Found expr:[400:14->402:27]
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[400:14->402:22], ...[402:24->402:27])
+posCursor:[402:25] posNoWhite:[402:24] Found expr:[402:24->402:27]
+Pexp_ident red:[402:24->402:27]
+Completable: Cpath Value[red]
+[{
+    "label": "red",
+    "kind": 12,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }]
+
+Complete src/Completion.res 405:22
+posCursor:[405:22] posNoWhite:[405:21] Found expr:[405:11->408:0]
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[405:11->405:22], ...[408:0->408:0])
+posCursor:[405:22] posNoWhite:[405:21] Found expr:[405:11->405:22]
+Pexp_apply ...__ghost__[0:-1->0:-1] (...[405:11->405:19], ...[405:21->405:22])
+posCursor:[405:22] posNoWhite:[405:21] Found expr:[405:21->405:22]
+Pexp_ident r:[405:21->405:22]
+Completable: Cpath Value[r]
+[{
+    "label": "red",
+    "kind": 12,
+    "tags": [],
+    "detail": "string",
+    "documentation": null
+  }, {
+    "label": "retAA",
+    "kind": 12,
+    "tags": [],
+    "detail": "unit => aa",
+    "documentation": null
+  }, {
+    "label": "r",
+    "kind": 12,
+    "tags": [],
+    "detail": "rAlias",
+    "documentation": null
+  }]
+

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

@@ -1,3 +1,3 @@
 DCE src/Dce.res
-issues:233
+issues:235
 

analysis/vendor/dune

@@ -0,0 +1 @@
+(dirs compiler-libs-406 ext res_outcome_printer json)