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

Author: aspeddro

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
         key: ${{matrix.os}}-rescript-vscode-v4
 
     - name: Use OCaml
-      uses: ocaml/setup-ocaml@v2
+      uses: ocaml/setup-ocaml@v2.1.7
       with:
         ocaml-compiler: 4.14.x
 

CHANGELOG.md

@@ -12,6 +12,24 @@
 
 ## master
 
+#### :bug: Bug Fix
+
+- Treat `result` type as a proper built in type. https://github.com/rescript-lang/rescript-vscode/pull/860
+
+#### :nail_care: Polish
+
+- Change end position of cursor when completing `Some(<fieldName>)` in patterns. https://github.com/rescript-lang/rescript-vscode/pull/857
+
+#### :bug: Bug Fix
+
+- Add support for detecting dead fields inside inline records. https://github.com/rescript-lang/rescript-vscode/pull/858
+
+## 1.28.0
+
+#### :bug: Bug Fix
+
+- Fix issue introduced in recent PR for module completion. https://github.com/rescript-lang/rescript-vscode/pull/856
+
 ## 1.26.0
 
 #### :bug: Bug Fix

analysis/bin/main.ml

@@ -87,48 +87,71 @@ Options:
 |}
 
 let main () =
-  match Array.to_list Sys.argv with
+  let args = Array.to_list Sys.argv in
+  let debugLevel, args =
+    match args with
+    | _ :: "debug-dump" :: logLevel :: rest ->
+      ( (match logLevel with
+        | "verbose" -> Debug.Verbose
+        | "regular" -> Regular
+        | _ -> Off),
+        "dummy" :: rest )
+    | args -> (Off, args)
+  in
+  Debug.debugLevel := debugLevel;
+  let debug = debugLevel <> Debug.Off in
+  let printHeaderInfo path line col =
+    if debug then
+      Printf.printf "Debug level: %s\n%s:%s-%s\n\n"
+        (match debugLevel with
+        | Debug.Verbose -> "verbose"
+        | Regular -> "regular"
+        | Off -> "off")
+        path line col
+  in
+  match args with
   | [_; "completion"; path; line; col; currentFile; supportsSnippets] ->
+    printHeaderInfo path line col;
     (Cfg.supportsSnippets :=
        match supportsSnippets with
        | "true" -> true
        | _ -> false);
-    Commands.completion ~debug:false ~path
+    Commands.completion ~debug ~path
       ~pos:(int_of_string line, int_of_string col)
       ~currentFile
   | [_; "definition"; path; line; col] ->
     Commands.definition ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~debug:false
+      ~debug
   | [_; "typeDefinition"; path; line; col] ->
     Commands.typeDefinition ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~debug:false
+      ~debug
   | [_; "documentSymbol"; path] -> DocumentSymbol.command ~path
   | [_; "hover"; path; line; col; currentFile; supportsMarkdownLinks] ->
     Commands.hover ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~currentFile ~debug:false
+      ~currentFile ~debug
       ~supportsMarkdownLinks:
         (match supportsMarkdownLinks with
         | "true" -> true
         | _ -> false)
   | [_; "signatureHelp"; path; line; col; currentFile] ->
     Commands.signatureHelp ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~currentFile ~debug:false
+      ~currentFile ~debug
   | [_; "inlayHint"; path; line_start; line_end; maxLength] ->
     Commands.inlayhint ~path
       ~pos:(int_of_string line_start, int_of_string line_end)
-      ~maxLength ~debug:false
-  | [_; "codeLens"; path] -> Commands.codeLens ~path ~debug:false
-  | [_; "extractDocs"; path] -> DocExtraction.extractDocs ~path ~debug:false
+      ~maxLength ~debug
+  | [_; "codeLens"; path] -> Commands.codeLens ~path ~debug
+  | [_; "extractDocs"; path] -> DocExtraction.extractDocs ~path ~debug
   | [_; "codeAction"; path; startLine; startCol; endLine; endCol; currentFile]
     ->
     Commands.codeAction ~path
       ~startPos:(int_of_string startLine, int_of_string startCol)
       ~endPos:(int_of_string endLine, int_of_string endCol)
-      ~currentFile ~debug:false
+      ~currentFile ~debug
   | [_; "codemod"; path; line; col; typ; hint] ->
     let typ =
       match typ with
@@ -138,7 +161,7 @@ let main () =
     let res =
       Codemod.transform ~path
         ~pos:(int_of_string line, int_of_string col)
-        ~debug:false ~typ ~hint
+        ~debug ~typ ~hint
       |> Json.escape
     in
     Printf.printf "\"%s\"" res
@@ -153,11 +176,11 @@ let main () =
   | [_; "references"; path; line; col] ->
     Commands.references ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~debug:false
+      ~debug
   | [_; "rename"; path; line; col; newName] ->
     Commands.rename ~path
       ~pos:(int_of_string line, int_of_string col)
-      ~newName ~debug:false
+      ~newName ~debug
   | [_; "semanticTokens"; currentFile] ->
     SemanticTokens.semanticTokens ~currentFile
   | [_; "createInterface"; path; cmiFile] ->

analysis/reanalyze/examples/deadcode/expected/deadcode.txt

@@ -87,6 +87,9 @@
   addValueDeclaration +version DeadMl.ml:29:8 path:+DeadMl.Bs_version
   addValueDeclaration +header DeadMl.ml:30:8 path:+DeadMl.Bs_version
   addValueDeclaration +package_name DeadMl.ml:31:8 path:+DeadMl.Bs_version
+  addRecordLabelDeclaration Lfunction.arity DeadMl.ml:35:21 path:+DeadMl.l
+  addRecordLabelDeclaration Lfunction.params DeadMl.ml:36:21 path:+DeadMl.l
+  addRecordLabelDeclaration Lfunction.body DeadMl.ml:37:21 path:+DeadMl.l
   addVariantCaseDeclaration Lfunction DeadMl.ml:35:2 path:+DeadMl.l
   addRecordLabelDeclaration module_name DeadMl.ml:41:2 path:+DeadMl.module_info
   addRecordLabelDeclaration case DeadMl.ml:42:2 path:+DeadMl.module_info
@@ -172,6 +175,7 @@
   addValueDeclaration +globallyLive3 DeadTest.res:154:6 path:+DeadTest.GloobLive
   addValueDeclaration +funWithInnerVars DeadTest.res:169:4 path:+DeadTest
   addValueDeclaration +deadIncorrect DeadTest.res:178:4 path:+DeadTest
+  addValueDeclaration +ira DeadTest.res:184:4 path:+DeadTest
   addValueReference DeadTest.res:1:15 --> ImmutableArray.resi:9:0
   addValueReference DeadTest.res:8:7 --> DeadTest.res:7:4
   addValueReference DeadTest.res:11:7 --> DeadTest.res:10:4
@@ -249,6 +253,26 @@
   addRecordLabelDeclaration a DeadTest.res:175:11 path:+DeadTest.rc
   addValueDeclaration +_ DeadTest.res:180:0 path:+DeadTest
   addValueReference DeadTest.res:180:8 --> DeadTest.res:178:4
+  addRecordLabelDeclaration IR.a DeadTest.res:182:24 path:+DeadTest.inlineRecord
+  addRecordLabelDeclaration IR.b DeadTest.res:182:32 path:+DeadTest.inlineRecord
+  addRecordLabelDeclaration IR.c DeadTest.res:182:40 path:+DeadTest.inlineRecord
+  addRecordLabelDeclaration IR.d DeadTest.res:182:51 path:+DeadTest.inlineRecord
+  addRecordLabelDeclaration IR.e DeadTest.res:182:65 path:+DeadTest.inlineRecord
+  addVariantCaseDeclaration IR DeadTest.res:182:20 path:+DeadTest.inlineRecord
+  addValueDeclaration +_ DeadTest.res:185:0 path:+DeadTest
+  addTypeReference DeadTest.res:187:20 --> DeadTest.res:182:20
+  addValueReference DeadTest.res:187:27 --> DeadTest.res:184:4
+  addTypeReference DeadTest.res:187:35 --> DeadTest.res:182:32
+  addValueReference DeadTest.res:187:35 --> DeadTest.res:187:7
+  addValueReference DeadTest.res:187:40 --> DeadTest.res:187:8
+  addTypeReference DeadTest.res:187:7 --> DeadTest.res:182:40
+  addValueReference DeadTest.res:186:9 --> DeadTest.res:185:8
+  addRecordLabelDeclaration IR2.a DeadTest.res:191:26 path:+DeadTest.inlineRecord2
+  addRecordLabelDeclaration IR2.b DeadTest.res:191:34 path:+DeadTest.inlineRecord2
+  addVariantCaseDeclaration IR2 DeadTest.res:191:21 path:+DeadTest.inlineRecord2
+  addRecordLabelDeclaration IR3.a DeadTest.res:193:34 path:+DeadTest.inlineRecord3
+  addRecordLabelDeclaration IR3.b DeadTest.res:193:42 path:+DeadTest.inlineRecord3
+  addVariantCaseDeclaration IR3 DeadTest.res:193:21 path:+DeadTest.inlineRecord3
   addValueReference DeadTest.res:28:2 --> DeadTest.res:31:6
   addValueReference DeadTest.res:36:2 --> DeadTest.res:39:6
   addValueReference DeadTest.res:60:2 --> DeadTest.res:64:6
@@ -1665,6 +1689,7 @@
   addVariantCaseDeclaration A Unboxed.res:5:10 path:+Unboxed.v2
   addValueReference Unboxed.res:8:4 --> Unboxed.res:8:14
   addRecordLabelDeclaration x Unboxed.res:11:11 path:+Unboxed.r1
+  addRecordLabelDeclaration B.g Unboxed.res:14:13 path:+Unboxed.r2
   addVariantCaseDeclaration B Unboxed.res:14:10 path:+Unboxed.r2
   addValueReference Unboxed.res:17:4 --> Unboxed.res:17:14
   Scanning Uncurried.cmt Source:Uncurried.res
@@ -1984,6 +2009,9 @@ File References
   Dead Value +DeadMl.+map_split_opt: 0 references () [0]
   Dead RecordLabel +DeadMl.module_info.case: 0 references () [0]
   Dead RecordLabel +DeadMl.module_info.module_name: 0 references () [0]
+  Dead RecordLabel +DeadMl.l.Lfunction.body: 0 references () [0]
+  Dead RecordLabel +DeadMl.l.Lfunction.params: 0 references () [0]
+  Dead RecordLabel +DeadMl.l.Lfunction.arity: 0 references () [0]
   Dead VariantCase +DeadMl.l.Lfunction: 0 references () [0]
   Dead Value +DeadMl.Bs_version.+package_name: 0 references () [1]
   Dead Value +DeadMl.Bs_version.+package_name: 0 references () [0]
@@ -2004,6 +2032,20 @@ File References
   Live VariantCase DeadRT.moduleAccessPath.Root: 1 references (DeadTest.res:106:16) [1]
   Live VariantCase +DeadRT.moduleAccessPath.Root: 1 references (DeadRT.resi:2:2) [0]
   Live VariantCase DeadRT.moduleAccessPath.Kaboom: 1 references (DeadRT.res:3:2) [0]
+  Dead RecordLabel +DeadTest.inlineRecord3.IR3.b: 0 references () [0]
+  Dead RecordLabel +DeadTest.inlineRecord3.IR3.a: 0 references () [0]
+  Dead VariantCase +DeadTest.inlineRecord3.IR3: 0 references () [0]
+  Dead RecordLabel +DeadTest.inlineRecord2.IR2.b: 0 references () [0]
+  Dead RecordLabel +DeadTest.inlineRecord2.IR2.a: 0 references () [0]
+  Dead VariantCase +DeadTest.inlineRecord2.IR2: 0 references () [0]
+  Dead Value +DeadTest.+_: 0 references () [0]
+  Live Value +DeadTest.+ira: 1 references (DeadTest.res:187:27) [0]
+  Live RecordLabel +DeadTest.inlineRecord.IR.e: 0 references () [0]
+  Dead RecordLabel +DeadTest.inlineRecord.IR.d: 0 references () [0]
+  Live RecordLabel +DeadTest.inlineRecord.IR.c: 1 references (DeadTest.res:187:7) [0]
+  Live RecordLabel +DeadTest.inlineRecord.IR.b: 1 references (DeadTest.res:187:35) [0]
+  Dead RecordLabel +DeadTest.inlineRecord.IR.a: 0 references () [0]
+  Live VariantCase +DeadTest.inlineRecord.IR: 1 references (DeadTest.res:187:20) [0]
   Dead Value +DeadTest.+_: 0 references () [0]
   Live Value +DeadTest.+deadIncorrect: 1 references (DeadTest.res:180:8) [0]
   Dead RecordLabel +DeadTest.rc.a: 0 references () [0]
@@ -2350,6 +2392,7 @@ File References
   Live Value +Types.+map: 0 references () [0]
   Live Value +Types.+someIntList: 0 references () [0]
   Live Value +Unboxed.+r2Test: 0 references () [0]
+  Dead RecordLabel +Unboxed.r2.B.g: 0 references () [0]
   Dead VariantCase +Unboxed.r2.B: 0 references () [0]
   Dead RecordLabel +Unboxed.r1.x: 0 references () [0]
   Live Value +Unboxed.+testV1: 0 references () [0]
@@ -2838,6 +2881,24 @@ File References
   <-- line 35
                          } [@dead "l.Lfunction"] 
 
+  Warning Dead Type
+  DeadMl.ml:35:22-34
+  l.Lfunction.arity is a record label never used to read a value
+  <-- line 35
+    | Lfunction of   { arity : int ; [@dead "l.Lfunction.arity"]  
+
+  Warning Dead Type
+  DeadMl.ml:36:22-40
+  l.Lfunction.params is a record label never used to read a value
+  <-- line 36
+                       params : int list ; [@dead "l.Lfunction.params"] 
+
+  Warning Dead Type
+  DeadMl.ml:37:22-34
+  l.Lfunction.body is a record label never used to read a value
+  <-- line 37
+                       body : string [@dead "l.Lfunction.body"]  
+
   Warning Dead Type
   DeadMl.ml:41:3-22
   module_info.module_name is a record label never used to read a value
@@ -3064,6 +3125,12 @@ File References
   <-- line 175
   type rc = {@dead("rc.a") a: int}
 
+  Warning Dead Type
+  DeadTest.res:182:25-30
+  inlineRecord.IR.a is a record label never used to read a value
+  <-- line 182
+  type inlineRecord = IR({@dead("inlineRecord.IR.a") a: int, b: int, c: string, @dead d: int, @live e: int})
+
   Warning Dead Module
   DeadTestBlacklist.res:0:1
   DeadTestBlacklist is a dead module as all its items are dead.
@@ -4448,7 +4515,13 @@ File References
   Unboxed.res:14:11-24
   r2.B is a variant case which is never constructed
   <-- line 14
-  type r2 = | @dead("r2.B") B({g: string})
+  type r2 = | @dead("r2.B") B({@dead("r2.B.g") g: string})
+
+  Warning Dead Type
+  Unboxed.res:14:14-22
+  r2.B.g is a record label never used to read a value
+  <-- line 14
+  type r2 = | @dead("r2.B") B({@dead("r2.B.g") g: string})
 
   Warning Dead Type
   Variants.res:95:14-39
@@ -4528,4 +4601,4 @@ File References
   <-- line 96
   type variant1Object = | @dead("variant1Object.R") R(payload)
 
-  Analysis reported 334 issues (Incorrect Dead Annotation:1, Warning Dead Exception:2, Warning Dead Module:25, Warning Dead Type:89, Warning Dead Value:199, Warning Dead Value With Side Effects:2, Warning Redundant Optional Argument:5, Warning Unused Argument:11)
+  Analysis reported 339 issues (Incorrect Dead Annotation:1, Warning Dead Exception:2, Warning Dead Module:25, Warning Dead Type:94, Warning Dead Value:199, Warning Dead Value With Side Effects:2, Warning Redundant Optional Argument:5, Warning Unused Argument:11)

analysis/reanalyze/examples/deadcode/src/DeadTest.bs.js

@@ -178,3 +178,16 @@ type rc = {a: int}
 let deadIncorrect = 34
 
 let _ = deadIncorrect
+
+type inlineRecord = IR({a: int, b: int, c: string, @dead d: int, @live e: int})
+
+let ira = 10
+let _ = ir =>
+  switch ir {
+  | IR({c} as r) => IR({a: ira, b: r.b, c, d: 0, e: 0})
+  }
+
+@dead
+type inlineRecord2 = IR2({a: int, b: int})
+
+type inlineRecord3 = | @dead IR3({a: int, b: int})

analysis/reanalyze/examples/deadcode/src/DeadTest.res

@@ -266,8 +266,22 @@ module ProcessDeadAnnotations = struct
       | Ttype_variant constructorDeclarations ->
         constructorDeclarations
         |> List.iter
-             (fun ({cd_attributes; cd_loc} : Typedtree.constructor_declaration)
+             (fun
+               ({cd_attributes; cd_loc; cd_args} :
+                 Typedtree.constructor_declaration)
              ->
+               let _process_inline_records =
+                 match cd_args with
+                 | Cstr_record flds ->
+                   List.iter
+                     (fun ({ld_attributes; ld_loc} :
+                            Typedtree.label_declaration) ->
+                       toplevelAttrs @ cd_attributes @ ld_attributes
+                       |> processAttributes ~doGenType:false ~name:""
+                            ~pos:ld_loc.loc_start)
+                     flds
+                 | Cstr_tuple _ -> ()
+               in
                toplevelAttrs @ cd_attributes
                |> processAttributes ~doGenType:false ~name:""
                     ~pos:cd_loc.loc_start)

analysis/reanalyze/src/DeadCommon.ml

@@ -102,7 +102,18 @@ let addDeclaration ~(typeId : Ident.t) ~(typeKind : Types.type_kind) =
       l
   | Type_variant decls ->
     List.iteri
-      (fun i {Types.cd_id; cd_loc} ->
+      (fun i {Types.cd_id; cd_loc; cd_args} ->
+        let _handle_inline_records =
+          match cd_args with
+          | Cstr_record lbls ->
+            List.iter
+              (fun {Types.ld_id; ld_loc} ->
+                Ident.name cd_id ^ "." ^ Ident.name ld_id
+                |> Name.create
+                |> processTypeLabel ~declKind:RecordLabel ~loc:ld_loc)
+              lbls
+          | Cstr_tuple _ -> ()
+        in
         let posAdjustment =
           (* In Res the variant loc can include the | and spaces after it *)
           if WriteDeadAnnotations.posLanguage cd_loc.loc_start = Res then