IncludePstr_include( Pmod_ident)

Author: nojaf

analysis/src/CompletionBackEnd.ml

@@ -458,7 +458,22 @@ let processLocalInclude includePath _loc ~prefix ~exact ~(env : QueryEnv.t)
   |> Hashtbl.iter (fun (name, _) (declared : Types.type_expr Declared.t) ->
          (* We check all the values if their origin is the same as the include path. *)
          match declared.modulePath with
-         | SharedTypes.ModulePath.IncludedModule (source, _) ->
+         | ModulePath.ExportedModule {name = exportedName}
+           when exportedName = includePath ->
+           if Utils.checkName name ~prefix ~exact then
+             if not (Hashtbl.mem localTables.namesUsed name) then (
+               Hashtbl.add localTables.namesUsed name ();
+               localTables.resultRev <-
+                 {
+                   (Completion.create declared.name.txt ~env
+                      ~kind:(Value declared.item))
+                   with
+                   deprecated = declared.deprecated;
+                   docstring = declared.docstring;
+                   synthetic = true;
+                 }
+                 :: localTables.resultRev)
+         | ModulePath.IncludedModule (source, _) ->
            let source_module_path =
              match Path.flatten source with
              | `Contains_apply -> ""

analysis/src/CompletionFrontEnd.ml

@@ -745,6 +745,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
       processed := true
     | Pstr_include {pincl_mod = {pmod_desc = med}} -> (
       match med with
+      | Pmod_ident {txt = lid; loc}
       | Pmod_apply ({pmod_desc = Pmod_ident {txt = lid; loc}}, _) ->
         let module_name = Longident.flatten lid |> String.concat "." in
         scope := !scope |> Scope.addInclude ~name:module_name ~loc

analysis/src/Completions.ml

@@ -9,7 +9,8 @@ let getCompletions ~debug ~path ~pos ~currentFile ~forHover =
     with
     | None -> None
     | Some (completable, scope) -> (
-      if debug then (
+      (* uncomment when debugging *)
+      if false then (
         Printf.printf "\nScope from frontend:\n";
         List.iter
           (fun item ->

tests/analysis_tests/tests/src/DotPipeCompleteFromCurrentModule.res

@@ -15,80 +15,3 @@ module Y = {
 
     let b = (x:t) => 4
 }
-
-
-module Types = {
-    type comp
-    type context
-    type vec2
-}
-
-module PosComp = (
-  T: {
-    type t
-  },
-) => {
-  open Types
-
-  @send
-  external addPos: (context, float, float) => comp = "pos"
-
-  @send
-  external addPosFromVec2: (context, vec2) => comp = "pos"
-}
-
-module SpriteComp = (
-    T: {
-        type t
-    }
-)
- => {
-    open Types
-
-    @send
-    external addSprite: (context, string) => comp = "sprite"
- }
-
-external k: Types.context = "k"
-
-@send
-external add: (Types.context, array<Types.comp>) => 't = "add"
-
-module Wall = {
-    type t
-
-    include PosComp({ type t = t })
-
-    let blah = (k: Types.context) => ""
-
-    let make = () => {
-        [
-            // k.
-            //   ^com
-
-            // add
-            //    ^com
-        ]
-    }
-
-    let makeWith = (x) => {
-        k->add([
-            k->addPos(1.0, 2.0),
-            // addP
-            //     ^com
-        ])
-    }
-
-    module Poster = {
-        type t
-
-        include SpriteComp({ type t = t })
-
-        let make = () => {
-            [
-                // k.
-                //   ^com
-            ]
-        }
-    }
-}

tests/analysis_tests/tests/src/IncludeModuleCompletion.res

@@ -0,0 +1,91 @@
+module Types = {
+  type comp
+
+  type context
+
+  type vec2
+}
+
+module PosComp = (
+  T: {
+    type t
+  },
+) => {
+  open Types
+
+  @send
+  external addPos: (context, float, float) => comp = "pos"
+
+  @send
+  external addPosFromVec2: (context, vec2) => comp = "pos"
+}
+
+module SpriteComp = (
+  T: {
+    type t
+  },
+) => {
+  open Types
+
+  @send
+  external addSprite: (context, string) => comp = "sprite"
+}
+
+external k: Types.context = "k"
+
+@send
+external add: (Types.context, array<Types.comp>) => 't = "add"
+
+module Wall = {
+  type t
+
+  include PosComp({type t = t})
+
+  let blah = (k: Types.context) => ""
+
+  let make = () => {
+    [
+      // k.
+      //   ^com
+      // add
+      //    ^com
+    ]
+  }
+
+  let makeWith = x => {
+    k->add([
+      k->addPos(1.0, 2.0),
+
+      // addP
+      //     ^com
+    ])
+  }
+
+  module Poster = {
+    type t
+
+    include SpriteComp({type t = t})
+
+    let make = () => {
+      [
+        // k.
+        //   ^com
+      ]
+    }
+  }
+}
+
+module M = {
+  let lex = (a: int) => "foo"
+}
+
+module N = {
+  include M
+
+  let a = 4
+  // let o = a.l
+  //            ^com
+
+  // let _ = l
+  //          ^com
+}