Also iter includes in findLocalCompletionsForValues

Author: nojaf

analysis/src/CompletionBackEnd.ml

@@ -551,6 +551,10 @@ let findLocalCompletionsForValues ~(localTables : LocalTables.t) ~env ~prefix
   scope
   |> Scope.iterModulesAfterFirstOpen
        (processLocalModule ~prefix ~exact ~env ~localTables);
+
+  scope
+  |> Scope.iterIncludes (processLocalInclude ~prefix ~exact ~env ~localTables);
+
   List.rev_append localTables.resultRev valuesFromOpens
 
 let findLocalCompletionsForTypes ~(localTables : LocalTables.t) ~env ~prefix

tests/analysis_tests/tests/src/DotPipeCompleteFromCurrentModule.res

@@ -51,6 +51,9 @@ module SpriteComp = (
 
 external k: Types.context = "k"
 
+@send
+external add: (Types.context, array<Types.comp>) => 't = "add"
+
 module Wall = {
     type t
 
@@ -68,6 +71,14 @@ module Wall = {
         ]
     }
 
+    let makeWith = (x) => {
+        k->add([
+            k->addPos(1.0, 2.0),
+            // addP
+            //     ^com
+        ])
+    }
+
     module Poster = {
         type t
 

tests/analysis_tests/tests/src/expected/DotPipeCompleteFromCurrentModule.res.txt

@@ -30,11 +30,11 @@ Path
       }]
   }]
 
-Complete src/DotPipeCompleteFromCurrentModule.res 62:17
-posCursor:[62:17] posNoWhite:[62:16] Found expr:[60:15->68:5]
-posCursor:[62:17] posNoWhite:[62:16] Found expr:[61:8->67:9]
-posCursor:[62:17] posNoWhite:[62:16] Found expr:[62:15->62:17]
-Pexp_field [62:15->62:16] _:[67:8->62:17]
+Complete src/DotPipeCompleteFromCurrentModule.res 65:17
+posCursor:[65:17] posNoWhite:[65:16] Found expr:[63:15->71:5]
+posCursor:[65:17] posNoWhite:[65:16] Found expr:[64:8->70:9]
+posCursor:[65:17] posNoWhite:[65:16] Found expr:[65:15->65:17]
+Pexp_field [65:15->65:16] _:[70:8->65:17]
 Completable: Cpath Value[k].""
 Package opens Stdlib.place holder Pervasives.JsxModules.place holder
 Resolved opens 1 Stdlib
@@ -56,7 +56,19 @@ Path
     "sortText": "blah",
     "insertText": "->blah",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 62, "character": 16}, "end": {"line": 62, "character": 17}},
+      "range": {"start": {"line": 65, "character": 16}, "end": {"line": 65, "character": 17}},
+      "newText": ""
+      }]
+  }, {
+    "label": "->add",
+    "kind": 12,
+    "tags": [],
+    "detail": "(Types.context, array<Types.comp>) => 't",
+    "documentation": null,
+    "sortText": "add",
+    "insertText": "->add",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 65, "character": 16}, "end": {"line": 65, "character": 17}},
       "newText": ""
       }]
   }, {
@@ -68,7 +80,7 @@ Path
     "sortText": "addPosFromVec2",
     "insertText": "->addPosFromVec2",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 62, "character": 16}, "end": {"line": 62, "character": 17}},
+      "range": {"start": {"line": 65, "character": 16}, "end": {"line": 65, "character": 17}},
       "newText": ""
       }]
   }, {
@@ -80,21 +92,50 @@ Path
     "sortText": "addPos",
     "insertText": "->addPos",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 62, "character": 16}, "end": {"line": 62, "character": 17}},
+      "range": {"start": {"line": 65, "character": 16}, "end": {"line": 65, "character": 17}},
       "newText": ""
       }]
   }]
 
-Complete src/DotPipeCompleteFromCurrentModule.res 65:18
-posCursor:[65:18] posNoWhite:[65:17] Found expr:[60:15->68:5]
-posCursor:[65:18] posNoWhite:[65:17] Found expr:[61:8->67:9]
-posCursor:[65:18] posNoWhite:[65:17] Found expr:[65:15->65:18]
-Pexp_ident add:[65:15->65:18]
+Complete src/DotPipeCompleteFromCurrentModule.res 68:18
+posCursor:[68:18] posNoWhite:[68:17] Found expr:[63:15->71:5]
+posCursor:[68:18] posNoWhite:[68:17] Found expr:[64:8->70:9]
+posCursor:[68:18] posNoWhite:[68:17] Found expr:[68:15->68:18]
+Pexp_ident add:[68:15->68:18]
 Completable: Cpath Value[add]
 Package opens Stdlib.place holder Pervasives.JsxModules.place holder
 Resolved opens 1 Stdlib
 ContextPath Value[add]
 Path add
+[{
+    "label": "add",
+    "kind": 12,
+    "tags": [],
+    "detail": "(Types.context, array<Types.comp>) => 't",
+    "documentation": null
+  }, {
+    "label": "addPosFromVec2",
+    "kind": 12,
+    "tags": [],
+    "detail": "(Types.context, Types.vec2) => Types.comp",
+    "documentation": null
+  }, {
+    "label": "addPos",
+    "kind": 12,
+    "tags": [],
+    "detail": "(Types.context, float, float) => Types.comp",
+    "documentation": null
+  }]
+
+Complete src/DotPipeCompleteFromCurrentModule.res 76:19
+posCursor:[76:19] posNoWhite:[76:18] Found expr:[73:19->79:5]
+posCursor:[76:19] posNoWhite:[76:18] Found expr:[74:8->78:10]
+Completable: Cexpression CArgument Value[add]($1)=addP->array
+Package opens Stdlib.place holder Pervasives.JsxModules.place holder
+Resolved opens 1 Stdlib
+ContextPath CArgument Value[add]($1)
+ContextPath Value[add]
+Path add
 [{
     "label": "addPosFromVec2",
     "kind": 12,
@@ -109,11 +150,11 @@ Path add
     "documentation": null
   }]
 
-Complete src/DotPipeCompleteFromCurrentModule.res 77:21
-posCursor:[77:21] posNoWhite:[77:20] Found expr:[75:19->80:9]
-posCursor:[77:21] posNoWhite:[77:20] Found expr:[76:12->79:13]
-posCursor:[77:21] posNoWhite:[77:20] Found expr:[77:19->77:21]
-Pexp_field [77:19->77:20] _:[79:12->77:21]
+Complete src/DotPipeCompleteFromCurrentModule.res 88:21
+posCursor:[88:21] posNoWhite:[88:20] Found expr:[86:19->91:9]
+posCursor:[88:21] posNoWhite:[88:20] Found expr:[87:12->90:13]
+posCursor:[88:21] posNoWhite:[88:20] Found expr:[88:19->88:21]
+Pexp_field [88:19->88:20] _:[90:12->88:21]
 Completable: Cpath Value[k].""
 Package opens Stdlib.place holder Pervasives.JsxModules.place holder
 Resolved opens 1 Stdlib
@@ -135,7 +176,19 @@ Path
     "sortText": "blah",
     "insertText": "->blah",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 77, "character": 20}, "end": {"line": 77, "character": 21}},
+      "range": {"start": {"line": 88, "character": 20}, "end": {"line": 88, "character": 21}},
+      "newText": ""
+      }]
+  }, {
+    "label": "->add",
+    "kind": 12,
+    "tags": [],
+    "detail": "(Types.context, array<Types.comp>) => 't",
+    "documentation": null,
+    "sortText": "add",
+    "insertText": "->add",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 88, "character": 20}, "end": {"line": 88, "character": 21}},
       "newText": ""
       }]
   }, {
@@ -147,7 +200,7 @@ Path
     "sortText": "addSprite",
     "insertText": "->addSprite",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 77, "character": 20}, "end": {"line": 77, "character": 21}},
+      "range": {"start": {"line": 88, "character": 20}, "end": {"line": 88, "character": 21}},
       "newText": ""
       }]
   }, {
@@ -159,7 +212,7 @@ Path
     "sortText": "addPosFromVec2",
     "insertText": "->addPosFromVec2",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 77, "character": 20}, "end": {"line": 77, "character": 21}},
+      "range": {"start": {"line": 88, "character": 20}, "end": {"line": 88, "character": 21}},
       "newText": ""
       }]
   }, {
@@ -171,7 +224,7 @@ Path
     "sortText": "addPos",
     "insertText": "->addPos",
     "additionalTextEdits": [{
-      "range": {"start": {"line": 77, "character": 20}, "end": {"line": 77, "character": 21}},
+      "range": {"start": {"line": 88, "character": 20}, "end": {"line": 88, "character": 21}},
       "newText": ""
       }]
   }]