wip

Author: zth

analysis/src/CompletionFrontEndNew.ml

@@ -506,17 +506,8 @@ and completeExpr ~completionContext (expr : Parsetree.expression) :
                    (CId (flattenLidCheckDot ~completionContext fieldName, Value))
                    completionContext
              else
-               completeExpr
-                 ~completionContext:
-                   (CompletionContext.addCtxPathItem
-                      (CRecordFieldFollow
-                         {
-                           fieldName = fieldName.txt |> Longident.last;
-                           recordCtxPath =
-                             ctxPathFromCompletionContext completionContext;
-                         })
-                      completionContext)
-                 fieldExpr)
+               (* TODO: Only follow if we can follow, otherwise set context appropriately. *)
+               completeExpr ~completionContext fieldExpr)
     in
     match fieldToComplete with
     | None -> (
@@ -598,7 +589,12 @@ and completeExpr ~completionContext (expr : Parsetree.expression) :
       completeExpr
         ~completionContext:(CompletionContext.resetCtx completionContext)
         condition
-    else if locHasPos then_.pexp_loc then completeExpr ~completionContext then_
+    else if locHasPos then_.pexp_loc then
+      completeExpr
+        ~completionContext:
+          (completionContext
+          |> CompletionContext.setCurrentlyExpecting completionContext.ctxPath)
+        then_
     else
       match maybeElse with
       | Some else_ ->
@@ -615,7 +611,7 @@ and completeExpr ~completionContext (expr : Parsetree.expression) :
         if checkIfExprHoleEmptyCursor ~completionContext then_ then
           let completionContext =
             completionContext
-            |> CompletionContext.addCtxPathItem (CId ([], Value))
+            |> CompletionContext.setCurrentlyExpecting completionContext.ctxPath
           in
           CompletionResult.expression ~completionContext ~prefix:""
         else None)

analysis/tests/src/CompletionNew.res

@@ -50,13 +50,13 @@ type someRecord = {nested: option<nestedRecord>, variant: someVariant, someStrin
 // let myFunc: someRecord = {nested: {maybeVariant: {let x = true; if x {}}}, }
 //                                                                     ^co2
 
-// This is the last expression
+// This is the last expression - NOTE: This should work but it's doing a follow
 // let myFunc: someRecord = {nested: {maybeVariant: {let x = true; if x {}}}, }
 //                                                                       ^co2
 
-// Complete as the last expression (looking for the record field type)
-// let myFunc: someRecord = {nested: {maybeVariant: {doStuff(); let x = true; if x {v}}}, }
-//                                                                                   ^co2
+// Complete as the last expression (looking for the record field type) - NOTE: This should work but it's doing a follow
+// let myFunc: someRecord = {nested: {maybeVariant: {doStuff(); let x = true; if x {So}}}, }
+//                                                                                    ^co2
 
 // Complete on the identifier, no context
 // let myFunc: someRecord = {nested: {maybeVariant: {doStuff(); let x = true; if x {v}}}, }

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

@@ -286,21 +286,29 @@ Resolved opens 1 pervasives
 
 Complete2 src/CompletionNew.res 53:73
 Scope: 106 items
-Completable: Cexpression: ctxPath: Value(prefix=) 
+Completable: Cexpression: ctxPath: ((Type(prefix=someRecord))->followRecordField{nested})->followRecordField{maybeVariant} 
 Package opens Pervasives.JsxModules.place holder
 Resolved opens 1 pervasives
-Path 
+Path someRecord
+CRecordFieldFollow: type of field ("nested") to follow: option<nestedRecord>
+CRecordFieldFollow: found type at record ctx path, but it's not a record: option<nestedRecord>
 []
 
-Complete2 src/CompletionNew.res 57:85
+Complete2 src/CompletionNew.res 57:86
 Scope: 106 items
-Completable: Cexpression: ctxPath: ((Type(prefix=someRecord))->followRecordField{nested})->followRecordField{maybeVariant} , prefix: "v"
+Completable: Cexpression: ctxPath: ((Type(prefix=someRecord))->followRecordField{nested})->followRecordField{maybeVariant} , prefix: "So"
 Package opens Pervasives.JsxModules.place holder
 Resolved opens 1 pervasives
 Path someRecord
 CRecordFieldFollow: type of field ("nested") to follow: option<nestedRecord>
 CRecordFieldFollow: found type at record ctx path, but it's not a record: option<nestedRecord>
-[]
+[{
+    "label": "Sort",
+    "kind": 9,
+    "tags": [],
+    "detail": "file module",
+    "documentation": null
+  }]
 
 Complete2 src/CompletionNew.res 61:58
 Scope: 105 items
@@ -328,11 +336,20 @@ CRecordField: found something that's not a record at the record ctx path: (~name
 
 Complete2 src/CompletionNew.res 72:72
 Scope: 109 items
-Completable: Cexpression: ctxPath: Value(prefix=) 
+Completable: Cexpression: ctxPath: Type(prefix=fn) 
 Package opens Pervasives.JsxModules.place holder
 Resolved opens 1 pervasives
-Path 
-[]
+Path fn
+[{
+    "label": "(~name=?, v1) => {}",
+    "kind": 12,
+    "tags": [],
+    "detail": "(~name: string=?, string) => bool",
+    "documentation": null,
+    "sortText": "A",
+    "insertText": "(~name=?, ${1:v1}) => {$0}",
+    "insertTextFormat": 2
+  }]
 
 Complete2 src/CompletionNew.res 76:60
 Scope: 108 items
@@ -547,10 +564,10 @@ CTypeAtLoc: found no type at loc
 
 Complete2 src/CompletionNew.res 158:40
 Scope: 107 items
-Completable: Cexpression: ctxPath: Value(prefix=) 
+Completable: Cexpression: ctxPath: CTypeAtLoc: [158:7->158:10] 
 Package opens Pervasives.JsxModules.place holder
 Resolved opens 1 pervasives
-Path 
+CTypeAtLoc: found no type at loc
 []
 
 Complete2 src/CompletionNew.res 161:35