handle switches

zth · cristianoc · commit 96412135b2d3 · 2023-03-09T18:56:20.000+01:00
diff --git a/analysis/src/CompletionFrontEnd.ml b/analysis/src/CompletionFrontEnd.ml
@@ -534,14 +534,6 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
           | false, false -> ()))
       | _ -> unsetLookingForPat ()
   in
-
-  let case (iterator : Ast_iterator.iterator) (case : Parsetree.case) =
-    let oldScope = !scope in
-    scopePattern ?contextPath:!currentCtxPath case.pc_lhs;
-    completePattern case.pc_lhs;
-    Ast_iterator.default_iterator.case iterator case;
-    scope := oldScope
-  in
   let structure (iterator : Ast_iterator.iterator)
       (structure : Parsetree.structure) =
     let oldScope = !scope in
@@ -787,6 +779,18 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
     in
     typedCompletionExpr expr;
     match expr.pexp_desc with
+    | Pexp_match (_expr, []) -> ()
+    | Pexp_match (expr, cases) ->
+      let ctxPath = exprToContextPath expr in
+      let oldCtxPath = !currentCtxPath in
+      cases
+      |> List.iter (fun (case : Parsetree.case) ->
+             let oldScope = !scope in
+             scopePattern ?contextPath:ctxPath case.pc_lhs;
+             completePattern case.pc_lhs;
+             Ast_iterator.default_iterator.case iterator case;
+             scope := oldScope);
+      resetCurrentCtxPath oldCtxPath
     | Pexp_apply
         ( {pexp_desc = Pexp_ident {txt = Lident "|."; loc = opLoc}},
           [
@@ -1157,7 +1161,6 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
     {
       Ast_iterator.default_iterator with
       attribute;
-      case;
       expr;
       location;
       module_expr;
diff --git a/analysis/tests/src/CompletionInferValues.res b/analysis/tests/src/CompletionInferValues.res
@@ -94,3 +94,7 @@ type otherNestedRecord = {someRecord: someRecord, someTuple: (someVariant, int)}
 // Follow tuples
 // let x: otherNestedRecord = Obj.magic(); let {someTuple} = x; let (_, someInt) = someTuple; someInt->toS
 //                                                                                                        ^com
+
+// Same as above, but follow in switch case
+// let x: otherNestedRecord; switch x { | {someTuple} => let (_, someInt) = someTuple; someInt->toS }
+//                                                                                                 ^com
diff --git a/analysis/tests/src/expected/BrokenParserCases.res.txt b/analysis/tests/src/expected/BrokenParserCases.res.txt
@@ -5,13 +5,11 @@ Completable: CnamedArg(Value[someFn], isOff, [isOff])
 []
 
 Complete src/BrokenParserCases.res 6:17
-posCursor:[6:17] posNoWhite:[6:16] Found expr:[6:3->6:21]
 posCursor:[6:17] posNoWhite:[6:16] Found pattern:[6:16->6:19]
 Completable: Cpattern Value[s]=t
 []
 
 Complete src/BrokenParserCases.res 10:29
-posCursor:[10:29] posNoWhite:[10:27] Found expr:[10:11->10:41]
 posCursor:[10:29] posNoWhite:[10:27] Found pattern:[10:24->10:39]
 posCursor:[10:29] posNoWhite:[10:27] Found pattern:[10:24->10:28]
 Ppat_construct None:[10:24->10:28]
diff --git a/analysis/tests/src/expected/Completion.res.txt b/analysis/tests/src/expected/Completion.res.txt
@@ -965,7 +965,6 @@ Resolved opens 2 Completion.res Completion.res
 []
 
 Complete src/Completion.res 243:8
-posCursor:[243:8] posNoWhite:[243:7] Found expr:[241:8->246:1]
 posCursor:[243:8] posNoWhite:[243:7] Found expr:[242:14->243:8]
 Pexp_apply ...[243:3->243:4] (...[242:14->242:15], ...[243:5->243:8])
 posCursor:[243:8] posNoWhite:[243:7] Found expr:[243:5->243:8]
@@ -1385,7 +1384,6 @@ Resolved opens 2 Completion.res Completion.res
   }]
 
 Complete src/Completion.res 343:57
-posCursor:[343:57] posNoWhite:[343:56] Found expr:[343:10->346:23]
 posCursor:[343:57] posNoWhite:[343:56] Found expr:[343:53->346:23]
 posCursor:[343:57] posNoWhite:[343:56] Found expr:[343:53->343:57]
 Pexp_ident this:[343:53->343:57]
@@ -1445,7 +1443,6 @@ posCursor:[355:23] posNoWhite:[355:22] Found expr:[355:12->355:23]
 
 Complete src/Completion.res 362:8
 posCursor:[362:8] posNoWhite:[362:7] Found expr:[360:8->365:3]
-posCursor:[362:8] posNoWhite:[362:7] Found expr:[361:2->365:3]
 posCursor:[362:8] posNoWhite:[362:7] Found pattern:[362:7->364:5]
 posCursor:[362:8] posNoWhite:[362:7] Found pattern:[362:7->362:8]
 Ppat_construct T:[362:7->362:8]
@@ -1482,7 +1479,6 @@ Resolved opens 2 Completion.res Completion.res
 
 Complete src/Completion.res 373:21
 posCursor:[373:21] posNoWhite:[373:20] Found expr:[371:8->376:3]
-posCursor:[373:21] posNoWhite:[373:20] Found expr:[372:2->376:3]
 posCursor:[373:21] posNoWhite:[373:20] Found pattern:[373:7->375:5]
 posCursor:[373:21] posNoWhite:[373:20] Found pattern:[373:7->373:21]
 Ppat_construct AndThatOther.T:[373:7->373:21]
diff --git a/analysis/tests/src/expected/CompletionFunctionArguments.res.txt b/analysis/tests/src/expected/CompletionFunctionArguments.res.txt
@@ -57,23 +57,8 @@ Complete src/CompletionFunctionArguments.res 21:27
 posCursor:[21:27] posNoWhite:[21:26] Found expr:[19:8->25:1]
 Pexp_apply ...[19:8->19:14] (~isOn20:3->20:7=...[21:7->23:8])
 posCursor:[21:27] posNoWhite:[21:26] Found expr:[21:7->23:8]
-posCursor:[21:27] posNoWhite:[21:26] Found expr:[21:7->21:28]
-posCursor:[21:27] posNoWhite:[21:26] Found expr:[21:14->21:28]
-Pexp_apply ...[21:14->21:20] (~isOn21:22->21:26=...__ghost__[0:-1->0:-1])
-Completable: Cexpression CArgument Value[someFn](~isOn)
-[{
-    "label": "true",
-    "kind": 4,
-    "tags": [],
-    "detail": "bool",
-    "documentation": null
-  }, {
-    "label": "false",
-    "kind": 4,
-    "tags": [],
-    "detail": "bool",
-    "documentation": null
-  }]
+posCursor:[21:27] posNoWhite:[21:26] Found expr:[21:7->23:8]
+[]
 
 Complete src/CompletionFunctionArguments.res 34:24
 posCursor:[34:24] posNoWhite:[34:23] Found expr:[34:11->34:25]
diff --git a/analysis/tests/src/expected/CompletionInferValues.res.txt b/analysis/tests/src/expected/CompletionInferValues.res.txt
@@ -222,7 +222,7 @@ Completable: Cpath Value[x].""
 
 Complete src/CompletionInferValues.res 74:78
 posCursor:[74:78] posNoWhite:[74:77] Found expr:[74:70->74:78]
-Pexp_field [74:70->74:77] _:[97:0->74:78]
+Pexp_field [74:70->74:77] _:[101:0->74:78]
 Completable: Cpath Value[srecord].""
 [{
     "label": "name",
@@ -240,7 +240,7 @@ Completable: Cpath Value[srecord].""
 
 Complete src/CompletionInferValues.res 78:86
 posCursor:[78:86] posNoWhite:[78:85] Found expr:[78:78->78:86]
-Pexp_field [78:78->78:85] _:[97:0->78:86]
+Pexp_field [78:78->78:85] _:[101:0->78:86]
 Completable: Cpath Value[aliased].""
 [{
     "label": "someRecord",
@@ -252,7 +252,7 @@ Completable: Cpath Value[aliased].""
 
 Complete src/CompletionInferValues.res 82:103
 posCursor:[82:103] posNoWhite:[82:102] Found expr:[82:92->82:103]
-Pexp_field [82:92->82:102] _:[97:0->82:103]
+Pexp_field [82:92->82:102] _:[101:0->82:103]
 Completable: Cpath Value[someRecord].""
 [{
     "label": "name",
@@ -307,3 +307,15 @@ Completable: Cpath Value[someInt]->toS
     "documentation": {"kind": "markdown", "value": "\n  Converts a given `int` to a `string`. Uses the JavaScript `String` constructor under the hood.\n\n  ```res example\n  Js.log(Belt.Int.toString(1) === \"1\") /* true */\n  ```\n"}
   }]
 
+Complete src/CompletionInferValues.res 98:99
+posCursor:[98:99] posNoWhite:[98:98] Found expr:[98:57->98:99]
+posCursor:[98:99] posNoWhite:[98:98] Found expr:[98:87->98:99]
+Completable: Cpath Value[someInt]->toS
+[{
+    "label": "Belt.Int.toString",
+    "kind": 12,
+    "tags": [],
+    "detail": "int => string",
+    "documentation": {"kind": "markdown", "value": "\n  Converts a given `int` to a `string`. Uses the JavaScript `String` constructor under the hood.\n\n  ```res example\n  Js.log(Belt.Int.toString(1) === \"1\") /* true */\n  ```\n"}
+  }]
+
diff --git a/analysis/tests/src/expected/CompletionPattern.res.txt b/analysis/tests/src/expected/CompletionPattern.res.txt
