handle scope

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -704,7 +704,8 @@ let getPipeCompletions ~env ~full ~identifierLoc ?posOfDot ~debug
       in
       let completionPath =
         match (completeAsBuiltin, typePath) with
-        | Some completionPathForBuiltin, _ -> Some completionPathForBuiltin
+        | Some completionPathForBuiltin, _ ->
+          Some (false, completionPathForBuiltin)
         | _, Some p -> (
           (* If this isn't a builtin, but we have a path, we try to resolve the
              module path relative to the env we're completing from. This ensures that
@@ -714,17 +715,32 @@ let getPipeCompletions ~env ~full ~identifierLoc ?posOfDot ~debug
             TypeUtils.getModulePathRelativeToEnv ~debug
               ~env:envCompletionIsMadeFrom ~envFromItem:env (Utils.expandPath p)
           with
-          | None -> Some [env.file.moduleName]
-          | Some p -> Some p)
+          | None -> Some (true, [env.file.moduleName])
+          | Some p -> Some (false, p))
         | _ -> None
       in
       match completionPath with
       | None -> []
-      | Some completionPath ->
+      | Some (isFromCurrentModule, completionPath) ->
         completionsForPipeFromCompletionPath ~envCompletionIsMadeFrom ~opens
           ~pos ~scope ~debug ~prefix ~env ~rawOpens ~full completionPath
         |> TypeUtils.filterPipeableFunctions ~env ~full
              ~synthetic:mainCompletionsAreSynthetic ~targetTypeId:mainTypeId
+        |> List.filter (fun (c : Completion.t) ->
+               (* If we're completing from the current module then we need to care about scope.
+                  This is automatically taken care of in other cases. *)
+               if isFromCurrentModule then
+                 match c.kind with
+                 | Value _ ->
+                   scope
+                   |> List.find_opt (fun (item : ScopeTypes.item) ->
+                          match item with
+                          | Value (scopeItemName, _, _, _) ->
+                            scopeItemName = c.name
+                          | _ -> false)
+                   |> Option.is_some
+                 | _ -> false
+               else true)
     in
     (* Extra completions can be drawn from the @editor.completeFrom attribute. Here we
        find and add those completions as well. *)

analysis/tests/src/DotPipeCompletionSpec.res

@@ -97,3 +97,11 @@ let str = "hello"
 
 // str->Js.String2.toLowerCase->Js.String2.toUpperCase.toLowerC
 //                                                             ^com
+
+let cc = (t: typeOutsideModule) => {
+  // t.
+  //   ^com
+  t
+}
+
+let outOfScope = (t: typeOutsideModule) => t

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

@@ -467,3 +467,64 @@ Path Js.String2.toLowerC
       }]
   }]
 
+Complete src/DotPipeCompletionSpec.res 101:7
+posCursor:[101:7] posNoWhite:[101:6] Found expr:[100:9->104:1]
+posCursor:[101:7] posNoWhite:[101:6] Found expr:[100:10->104:1]
+posCursor:[101:7] posNoWhite:[101:6] Found expr:[101:5->103:3]
+Pexp_field [101:5->101:6] t:[103:2->103:3]
+Completable: Cpath Value[t].""
+Package opens Pervasives.JsxModules.place holder
+Resolved opens 1 pervasives
+ContextPath Value[t].""
+ContextPath Value[t]
+Path t
+ContextPath Value[t]->
+ContextPath Value[t]
+Path t
+CPPipe pathFromEnv: found:true
+Path DotPipeCompletionSpec.
+Path DotPipeCompletionSpec.SomeOtherModule.
+[{
+    "label": "nname",
+    "kind": 5,
+    "tags": [],
+    "detail": "string",
+    "documentation": {"kind": "markdown", "value": "```rescript\nnname: string\n```\n\n```rescript\ntype typeOutsideModule = {nname: string}\n```"}
+  }, {
+    "label": "->doWithTypeOutsideModule",
+    "kind": 12,
+    "tags": [],
+    "detail": "typeOutsideModule => string",
+    "documentation": null,
+    "sortText": "doWithTypeOutsideModule",
+    "insertText": "->doWithTypeOutsideModule",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 101, "character": 6}, "end": {"line": 101, "character": 7}},
+      "newText": ""
+      }]
+  }, {
+    "label": "->SomeOtherModule.getNName",
+    "kind": 12,
+    "tags": [],
+    "detail": "t => string",
+    "documentation": null,
+    "sortText": "getNName",
+    "insertText": "->SomeOtherModule.getNName",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 101, "character": 6}, "end": {"line": 101, "character": 7}},
+      "newText": ""
+      }]
+  }, {
+    "label": "->SomeOtherModule.getNName2",
+    "kind": 12,
+    "tags": [],
+    "detail": "typeOutsideModule => string",
+    "documentation": null,
+    "sortText": "getNName2",
+    "insertText": "->SomeOtherModule.getNName2",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 101, "character": 6}, "end": {"line": 101, "character": 7}},
+      "newText": ""
+      }]
+  }]
+