more sane way of ensuring the file module name gets picked up

Author: zth

analysis/src/CompletionBackEnd.ml

@@ -562,9 +562,7 @@ let completionForExporteds iterExported getDeclared ~prefix ~exact ~env
               with
               deprecated = declared.deprecated;
               docstring = declared.docstring;
-              modulePath =
-                [env.file.moduleName]
-                @ ModulePath.toPathWithoutTip declared.modulePath;
+              modulePath = ModulePath.toFullPath declared.modulePath;
             }
             :: !res
         | _ -> ());
@@ -1292,7 +1290,7 @@ let rec getCompletionsForContextPath ~package ~opens ~rawOpens ~allFiles ~pos
            ~env ~exact:true ~scope
       |> completionsGetTypeEnv
     with
-    | Some (typ, _envFromCompletion, completionItemModulePath) -> (
+    | Some (typ, _envFromCompletionItem, completionItemModulePath) -> (
       let {
         arrayModulePath;
         optionModulePath;

analysis/src/SharedTypes.ml

@@ -23,10 +23,10 @@ module ModulePath = struct
     in
     loop modulePath [tipName]
 
-  let toPathWithoutTip modulePath : path =
+  let toFullPath modulePath : path =
     let rec loop modulePath current =
       match modulePath with
-      | File _ -> current
+      | File (_, fileModule) -> fileModule :: current
       | IncludedModule (_, inner) -> loop inner current
       | ExportedModule {name; modulePath = inner} -> loop inner (name :: current)
       | NotVisible -> current