Comment out scope thing

nojaf · nojaf · commit 8f79cd2de08a · 2025-02-13T20:13:48.000+01:00
diff --git a/analysis/src/CompletionBackEnd.ml b/analysis/src/CompletionBackEnd.ml
@@ -1125,7 +1125,7 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
               ~pos ~scope ~debug ~prefix ~env ~rawOpens ~full completionPath
             |> TypeUtils.filterPipeableFunctions ~env ~full ~synthetic
                  ~targetTypeId:mainTypeId
-            |> List.filter (fun (c : Completion.t) ->
+            (* |> 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
@@ -1139,7 +1139,7 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
                               | _ -> false)
                        |> Option.is_some
                      | _ -> false
-                   else true)
+                   else true) *)
         in
         (* Extra completions can be drawn from the @editor.completeFrom attribute. Here we
            find and add those completions as well. *)
diff --git a/tests/analysis_tests/tests/src/expected/CompletionJsx.res.txt b/tests/analysis_tests/tests/src/expected/CompletionJsx.res.txt
@@ -172,6 +172,18 @@ Path Js_string2.st
     "documentation": {"kind": "markdown", "value": "Turns `string` into a JSX element so it can be used inside of JSX."},
     "sortText": "A",
     "insertTextFormat": 2
+  }, {
+    "label": "Js_string2.startsWith",
+    "kind": 12,
+    "tags": [],
+    "detail": "(t, t) => bool",
+    "documentation": {"kind": "markdown", "value": "\nES2015: `startsWith(str, substr)` returns `true` if the `str` starts with\n`substr`, `false` otherwise.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n## Examples\n\n```rescript\nJs.String2.startsWith(\"ReScript\", \"Re\") == true\nJs.String2.startsWith(\"ReScript\", \"\") == true\nJs.String2.startsWith(\"JavaScript\", \"Re\") == false\n```\n"}
+  }, {
+    "label": "Js_string2.startsWithFrom",
+    "kind": 12,
+    "tags": [],
+    "detail": "(t, t, int) => bool",
+    "documentation": {"kind": "markdown", "value": "\nES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts\nwith `substr` starting at position `n`, false otherwise. If `n` is negative,\nthe search starts at the beginning of `str`.\n\nSee [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)\non MDN.\n\n## Examples\n\n```rescript\nJs.String2.startsWithFrom(\"ReScript\", \"Scri\", 2) == true\nJs.String2.startsWithFrom(\"ReScript\", \"\", 2) == true\nJs.String2.startsWithFrom(\"JavaScript\", \"Scri\", 2) == false\n```\n"}
   }]
 
 Complete src/CompletionJsx.res 24:19
diff --git a/tests/analysis_tests/tests/src/expected/DotPipeCompletionSpec.res.txt b/tests/analysis_tests/tests/src/expected/DotPipeCompletionSpec.res.txt
@@ -281,6 +281,18 @@ Path DotPipeCompletionSpec.SomeOtherModule.
     "tags": [],
     "detail": "string",
     "documentation": {"kind": "markdown", "value": "```rescript\nnname: string\n```\n\n```rescript\ntype typeOutsideModule = {nname: string}\n```"}
+  }, {
+    "label": "->outOfScope",
+    "kind": 12,
+    "tags": [],
+    "detail": "typeOutsideModule => typeOutsideModule",
+    "documentation": null,
+    "sortText": "outOfScope",
+    "insertText": "->outOfScope",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 80, "character": 6}, "end": {"line": 80, "character": 7}},
+      "newText": ""
+      }]
   }, {
     "label": "->doWithTypeOutsideModule",
     "kind": 12,
@@ -293,6 +305,18 @@ Path DotPipeCompletionSpec.SomeOtherModule.
       "range": {"start": {"line": 80, "character": 6}, "end": {"line": 80, "character": 7}},
       "newText": ""
       }]
+  }, {
+    "label": "->cc",
+    "kind": 12,
+    "tags": [],
+    "detail": "typeOutsideModule => typeOutsideModule",
+    "documentation": null,
+    "sortText": "cc",
+    "insertText": "->cc",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 80, "character": 6}, "end": {"line": 80, "character": 7}},
+      "newText": ""
+      }]
   }, {
     "label": "->SomeOtherModule.getNName",
     "kind": 12,
@@ -335,7 +359,31 @@ ContextPath Value[Js, Array2, filter]
 Path Js.Array2.filter
 CPPipe pathFromEnv: found:true
 Path Js_array2.filt
-[]
+[{
+    "label": "->Js_array2.filter",
+    "kind": 12,
+    "tags": [],
+    "detail": "(t<'a>, 'a => bool) => t<'a>",
+    "documentation": {"kind": "markdown", "value": "\nApplies the given predicate function (the second argument) to each element in\nthe array; the result is an array of those elements for which the predicate\nfunction returned `true`. See\n[`Array.filter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter)\non MDN.\n\n## Examples\n\n```rescript\nlet nonEmpty = s => s != \"\"\nJs.Array2.filter([\"abc\", \"\", \"\", \"def\", \"ghi\"], nonEmpty) == [\"abc\", \"def\", \"ghi\"]\n```\n"},
+    "sortText": "filter",
+    "insertText": "->Js_array2.filter",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 86, "character": 38}, "end": {"line": 86, "character": 39}},
+      "newText": ""
+      }]
+  }, {
+    "label": "->Js_array2.filteri",
+    "kind": 12,
+    "tags": [],
+    "detail": "(t<'a>, ('a, int) => bool) => t<'a>",
+    "documentation": {"kind": "markdown", "value": "\nEach element of the given array are passed to the predicate function. The\nreturn value is an array of all those elements for which the predicate function\nreturned `true`.\n\nSee\n[`Array.filter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter)\non MDN.\n\n## Examples\n\n```rescript\n// keep only positive elements at odd indices\nlet positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0\n\nJs.Array2.filteri([6, 3, 5, 8, 7, -4, 1], positiveOddElement) == [3, 8]\n```\n"},
+    "sortText": "filteri",
+    "insertText": "->Js_array2.filteri",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 86, "character": 38}, "end": {"line": 86, "character": 39}},
+      "newText": ""
+      }]
+  }]
 
 Complete src/DotPipeCompletionSpec.res 89:70
 posCursor:[89:70] posNoWhite:[89:69] Found expr:[89:3->89:70]
@@ -393,7 +441,19 @@ ContextPath Value[Js, String2, toLowerCase]
 Path Js.String2.toLowerCase
 CPPipe pathFromEnv: found:true
 Path Js_string2.toUpperCa
-[]
+[{
+    "label": "->Js_string2.toUpperCase",
+    "kind": 12,
+    "tags": [],
+    "detail": "t => t",
+    "documentation": {"kind": "markdown", "value": "\n`toUpperCase(str)` converts `str` to upper case using the locale-insensitive\ncase mappings in the Unicode Character Database. Notice that the conversion can\nexpand the number of letters in the result; for example the German ß\ncapitalizes to two Ses in a row.\n\nSee [`String.toUpperCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase)\non MDN.\n\n## Examples\n\n```rescript\nJs.String2.toUpperCase(\"abc\") == \"ABC\"\nJs.String2.toUpperCase(`Straße`) == `STRASSE`\nJs.String2.toUpperCase(`πς`) == `ΠΣ`\n```\n"},
+    "sortText": "toUpperCase",
+    "insertText": "->Js_string2.toUpperCase",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 94, "character": 30}, "end": {"line": 94, "character": 31}},
+      "newText": ""
+      }]
+  }]
 
 Complete src/DotPipeCompletionSpec.res 97:63
 posCursor:[97:63] posNoWhite:[97:62] Found expr:[97:3->97:63]
@@ -410,7 +470,19 @@ ContextPath Value[Js, String2, toUpperCase]
 Path Js.String2.toUpperCase
 CPPipe pathFromEnv: found:true
 Path Js_string2.toLowerC
-[]
+[{
+    "label": "->Js_string2.toLowerCase",
+    "kind": 12,
+    "tags": [],
+    "detail": "t => t",
+    "documentation": {"kind": "markdown", "value": "\n`toLowerCase(str)` converts `str` to lower case using the locale-insensitive\ncase mappings in the Unicode Character Database. Notice that the conversion can\ngive different results depending upon context, for example with the Greek\nletter sigma, which has two different lower case forms; one when it is the last\ncharacter in a string and another when it is not.\n\nSee [`String.toLowerCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase)\non MDN.\n\n## Examples\n\n```rescript\nJs.String2.toLowerCase(\"ABC\") == \"abc\"\nJs.String2.toLowerCase(`ΣΠ`) == `σπ`\nJs.String2.toLowerCase(`ΠΣ`) == `πς`\n```\n"},
+    "sortText": "toLowerCase",
+    "insertText": "->Js_string2.toLowerCase",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 97, "character": 54}, "end": {"line": 97, "character": 55}},
+      "newText": ""
+      }]
+  }]
 
 Complete src/DotPipeCompletionSpec.res 101:7
 posCursor:[101:7] posNoWhite:[101:6] Found expr:[100:9->104:1]
@@ -433,6 +505,18 @@ Path DotPipeCompletionSpec.SomeOtherModule.
     "tags": [],
     "detail": "string",
     "documentation": {"kind": "markdown", "value": "```rescript\nnname: string\n```\n\n```rescript\ntype typeOutsideModule = {nname: string}\n```"}
+  }, {
+    "label": "->outOfScope",
+    "kind": 12,
+    "tags": [],
+    "detail": "typeOutsideModule => typeOutsideModule",
+    "documentation": null,
+    "sortText": "outOfScope",
+    "insertText": "->outOfScope",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 101, "character": 6}, "end": {"line": 101, "character": 7}},
+      "newText": ""
+      }]
   }, {
     "label": "->doWithTypeOutsideModule",
     "kind": 12,
@@ -445,6 +529,18 @@ Path DotPipeCompletionSpec.SomeOtherModule.
       "range": {"start": {"line": 101, "character": 6}, "end": {"line": 101, "character": 7}},
       "newText": ""
       }]
+  }, {
+    "label": "->cc",
+    "kind": 12,
+    "tags": [],
+    "detail": "typeOutsideModule => typeOutsideModule",
+    "documentation": null,
+    "sortText": "cc",
+    "insertText": "->cc",
+    "additionalTextEdits": [{
+      "range": {"start": {"line": 101, "character": 6}, "end": {"line": 101, "character": 7}},
+      "newText": ""
+      }]
   }, {
     "label": "->SomeOtherModule.getNName",
     "kind": 12,
