Print pathFromEnv and whether the path was found.

Author: cristianoc

analysis/src/CompletionBackEnd.ml

@@ -917,17 +917,18 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~allFiles ~pos
             | _ :: pathRev ->
               (* type path is relative to the completion environment
                  express it from the root of the file *)
-              let pathFromEnv_ =
+              let found, pathFromEnv =
                 QueryEnv.pathFromEnv envFromCompletionItem (List.rev pathRev)
               in
-              if pathFromEnv_ = [] then None
-              else
-                let pathFromEnv =
-                  if env.file.moduleName = envFromCompletionItem.file.moduleName
-                  then pathFromEnv_
-                  else envFromCompletionItem.file.moduleName :: pathFromEnv_
-                in
-                Some pathFromEnv
+              if debug then
+                Printf.printf "CPPipe pathFromEnv:%s found:%b\n"
+                  (pathFromEnv |> String.concat ".")
+                  found;
+              if pathFromEnv = [] then None
+              else if
+                env.file.moduleName = envFromCompletionItem.file.moduleName
+              then Some pathFromEnv
+              else Some (envFromCompletionItem.file.moduleName :: pathFromEnv)
             | _ -> None)
           | _ -> None)
       in

analysis/src/SharedTypes.ml

@@ -266,7 +266,7 @@ module QueryEnv : sig
      E.g. the env is at A.B.C and the path is D.
      The result is A.B.C.D if D is inside C.
      Or A.B.D or A.D or D if it's in one of its parents. *)
-  val pathFromEnv : t -> path -> path
+  val pathFromEnv : t -> path -> bool * path
 
   val toString : t -> string
 end = struct
@@ -280,22 +280,22 @@ end = struct
 
   (* Prune a path and find a parent environment that contains the module name *)
   let rec prunePath pathRev env name =
-    if Exported.find env.exported Module name <> None then pathRev
+    if Exported.find env.exported Module name <> None then (true, pathRev)
     else
       match (pathRev, env.parent) with
       | _ :: rest, Some env -> prunePath rest env name
-      | _ -> []
+      | _ -> (false, [])
 
   let pathFromEnv env path =
     match path with
-    | [] -> env.pathRev |> List.rev
+    | [] -> (true, env.pathRev |> List.rev)
     | name :: _ ->
-      let prunedPathRev = prunePath env.pathRev env name in
-      List.rev_append prunedPathRev path
+      let found, prunedPathRev = prunePath env.pathRev env name in
+      (found, List.rev_append prunedPathRev path)
 
   let enterStructure env (structure : Module.structure) =
     let name = structure.name in
-    let pathRev = name :: prunePath env.pathRev env name in
+    let pathRev = name :: snd (prunePath env.pathRev env name) in
     {env with exported = structure.exported; pathRev; parent = Some env}
 end
 

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

@@ -6,6 +6,7 @@ ContextPath Value[a]
 Path a
 CPPipe env:CompletePrioritize1
 CPPipe type path:Test.t
+CPPipe pathFromEnv:Test found:true
 Path Test.
 [{
     "label": "Test.add",

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

@@ -6,6 +6,7 @@ ContextPath Value[ax]
 Path ax
 CPPipe env:CompletePrioritize2
 CPPipe type path:Test.t
+CPPipe pathFromEnv:Test found:true
 Path Test.
 [{
     "label": "Test.add",

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

@@ -455,6 +455,7 @@ ContextPath Value[fa]
 Path fa
 CPPipe env:Completion
 CPPipe type path:ForAuto.t
+CPPipe pathFromEnv:ForAuto found:true
 Path ForAuto.
 [{
     "label": "ForAuto.abc",
@@ -1017,6 +1018,7 @@ ContextPath Value[FAO, forAutoObject]
 Path FAO.forAutoObject
 CPPipe env:Completion envFromCompletionItem:Completion.FAR
 CPPipe type path:ForAuto.t
+CPPipe pathFromEnv:ForAuto found:false
 Path ForAuto.
 [{
     "label": "ForAuto.abc",

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

@@ -351,6 +351,7 @@ ContextPath Value[thisGetsBrokenLoc]
 Path thisGetsBrokenLoc
 CPPipe env:CompletionFunctionArguments
 CPPipe type path:ReactEvent.Mouse.t
+CPPipe pathFromEnv:ReactEvent.Mouse found:false
 Path ReactEvent.Mouse.a
 [{
     "label": "ReactEvent.Mouse.altKey",
@@ -373,6 +374,7 @@ ContextPath Value[reassignedWorks]
 Path reassignedWorks
 CPPipe env:CompletionFunctionArguments
 CPPipe type path:ReactEvent.Mouse.t
+CPPipe pathFromEnv:ReactEvent.Mouse found:false
 Path ReactEvent.Mouse.a
 [{
     "label": "ReactEvent.Mouse.altKey",

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

@@ -150,6 +150,7 @@ ContextPath Value[reactEventFn]
 Path reactEventFn
 CPPipe env:CompletionInferValues
 CPPipe type path:ReactEvent.Mouse.t
+CPPipe pathFromEnv:ReactEvent.Mouse found:false
 Path ReactEvent.Mouse.pr
 [{
     "label": "ReactEvent.Mouse.preventDefault",
@@ -174,6 +175,7 @@ Path ReactDOM.domProps
 Path JsxDOM.domProps
 CPPipe env:CompletionInferValues
 CPPipe type path:JsxEvent.Mouse.t
+CPPipe pathFromEnv:JsxEvent.Mouse found:false
 Path JsxEvent.Mouse.pr
 [{
     "label": "JsxEvent.Mouse.preventDefault",
@@ -197,6 +199,7 @@ ContextPath CJsxPropValue [Div] onMouseEnter
 Path Div.make
 CPPipe env:CompletionInferValues envFromCompletionItem:CompletionInferValues.Div
 CPPipe type path:JsxEvent.Mouse.t
+CPPipe pathFromEnv:JsxEvent.Mouse found:false
 Path JsxEvent.Mouse.pr
 [{
     "label": "JsxEvent.Mouse.preventDefault",
@@ -666,6 +669,7 @@ ContextPath Value[fn2]
 Path fn2
 CPPipe env:CompletionInferValues
 CPPipe type path:ReactDOM.Client.Root.t
+CPPipe pathFromEnv:ReactDOM.Client.Root found:false
 Path ReactDOM.Client.Root.
 [{
     "label": "ReactDOM.Client.Root.unmount",
@@ -698,6 +702,7 @@ ContextPath Value[fn3]
 Path fn3
 CPPipe env:CompletionInferValues
 CPPipe type path:CompletionSupport.Test.t
+CPPipe pathFromEnv:CompletionSupport.Test found:false
 Path CompletionSupport.Test.
 [{
     "label": "CompletionSupport.Test.add",
@@ -793,6 +798,7 @@ ContextPath Value[CompletionSupport2, makeRenderer]
 Path CompletionSupport2.makeRenderer
 CPPipe env:CompletionInferValues envFromCompletionItem:CompletionSupport2.Internal
 CPPipe type path:ReactDOM.Client.Root.t
+CPPipe pathFromEnv:ReactDOM.Client.Root found:false
 Path CompletionSupport2.ReactDOM.Client.Root.
 []
 

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

@@ -6,6 +6,7 @@ ContextPath Value[int]
 Path int
 CPPipe env:CompletionPipeChain
 CPPipe type path:Integer.t
+CPPipe pathFromEnv:Integer found:true
 Path Integer.
 [{
     "label": "Integer.toInt",
@@ -42,6 +43,7 @@ ContextPath Value[toFlt]
 Path toFlt
 CPPipe env:CompletionPipeChain
 CPPipe type path:SuperFloat.t
+CPPipe pathFromEnv:SuperFloat found:true
 Path SuperFloat.
 [{
     "label": "SuperFloat.fromInteger",
@@ -66,6 +68,7 @@ ContextPath Value[Integer, increment]
 Path Integer.increment
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionPipeChain.Integer
 CPPipe type path:t
+CPPipe pathFromEnv:Integer found:true
 Path Integer.
 [{
     "label": "Integer.toInt",
@@ -102,6 +105,7 @@ ContextPath Value[Integer, increment]
 Path Integer.increment
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionPipeChain.Integer
 CPPipe type path:t
+CPPipe pathFromEnv:Integer found:true
 Path Integer.
 [{
     "label": "Integer.toInt",
@@ -138,6 +142,7 @@ ContextPath Value[Integer, decrement]
 Path Integer.decrement
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionPipeChain.Integer
 CPPipe type path:t
+CPPipe pathFromEnv:Integer found:true
 Path Integer.
 [{
     "label": "Integer.toInt",
@@ -174,6 +179,7 @@ ContextPath Value[Integer, decrement]
 Path Integer.decrement
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionPipeChain.Integer
 CPPipe type path:t
+CPPipe pathFromEnv:Integer found:true
 Path Integer.
 [{
     "label": "Integer.toInt",
@@ -210,6 +216,7 @@ ContextPath Value[SuperFloat, fromInteger]
 Path SuperFloat.fromInteger
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionPipeChain.SuperFloat
 CPPipe type path:t
+CPPipe pathFromEnv:SuperFloat found:true
 Path SuperFloat.
 [{
     "label": "SuperFloat.fromInteger",
@@ -234,6 +241,7 @@ ContextPath Value[SuperFloat, fromInteger]
 Path SuperFloat.fromInteger
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionPipeChain.SuperFloat
 CPPipe type path:t
+CPPipe pathFromEnv:SuperFloat found:true
 Path SuperFloat.t
 [{
     "label": "SuperFloat.toInteger",
@@ -252,6 +260,7 @@ ContextPath Value[CompletionSupport, Test, make]
 Path CompletionSupport.Test.make
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionSupport.Test
 CPPipe type path:t
+CPPipe pathFromEnv:Test found:true
 Path CompletionSupport.Test.
 [{
     "label": "CompletionSupport.Test.add",
@@ -282,6 +291,7 @@ ContextPath Value[CompletionSupport, Test, addSelf]
 Path CompletionSupport.Test.addSelf
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionSupport.Test
 CPPipe type path:t
+CPPipe pathFromEnv:Test found:true
 Path CompletionSupport.Test.
 [{
     "label": "CompletionSupport.Test.add",
@@ -312,6 +322,7 @@ ContextPath Value[Js, Array2, forEach]
 Path Js.Array2.forEach
 CPPipe env:CompletionPipeChain envFromCompletionItem:Js_array2
 CPPipe type path:unit
+CPPipe pathFromEnv: found:true
 []
 
 Complete src/CompletionPipeChain.res 62:6
@@ -345,6 +356,7 @@ ContextPath Value[aliased]
 Path aliased
 CPPipe env:CompletionPipeChain
 CPPipe type path:CompletionSupport.Test.t
+CPPipe pathFromEnv:CompletionSupport.Test found:false
 Path CompletionSupport.Test.
 [{
     "label": "CompletionSupport.Test.add",
@@ -374,6 +386,7 @@ ContextPath Value[notAliased]
 Path notAliased
 CPPipe env:CompletionPipeChain
 CPPipe type path:CompletionSupport.Test.t
+CPPipe pathFromEnv:CompletionSupport.Test found:false
 Path CompletionSupport.Test.
 [{
     "label": "CompletionSupport.Test.add",
@@ -410,6 +423,7 @@ ContextPath Value[props]
 Path props
 CPPipe env:CompletionPipeChain envFromCompletionItem:CompletionSupport.Nested
 CPPipe type path:ReactDOM.Client.Root.t
+CPPipe pathFromEnv:ReactDOM.Client.Root found:false
 Path CompletionSupport.ReactDOM.Client.Root.ren
 []
 
@@ -428,6 +442,7 @@ ContextPath Value[root]
 Path root
 CPPipe env:CompletionPipeChain
 CPPipe type path:ReactDOM.Client.Root.t
+CPPipe pathFromEnv:ReactDOM.Client.Root found:false
 Path ReactDOM.Client.Root.ren
 [{
     "label": "ReactDOM.Client.Root.render",

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

@@ -6,6 +6,7 @@ ContextPath Value[A, B1, xx]
 Path A.B1.xx
 CPPipe env:CompletionPipeSubmodules envFromCompletionItem:CompletionPipeSubmodules.A.B1
 CPPipe type path:b1
+CPPipe pathFromEnv:A.B1 found:true
 Path A.B1.
 [{
     "label": "A.B1.xx",
@@ -30,6 +31,7 @@ ContextPath Value[A, x]
 Path A.x
 CPPipe env:CompletionPipeSubmodules envFromCompletionItem:CompletionPipeSubmodules.A
 CPPipe type path:B1.b1
+CPPipe pathFromEnv:A.B1 found:true
 Path A.B1.
 [{
     "label": "A.B1.xx",
@@ -55,6 +57,7 @@ ContextPath Value[E, e]
 Path E.e
 CPPipe env:CompletionPipeSubmodules envFromCompletionItem:CompletionPipeSubmodules.D
 CPPipe type path:C.t
+CPPipe pathFromEnv:C found:false
 Path C.
 [{
     "label": "C.C",
@@ -74,6 +77,7 @@ ContextPath Value[E, e]
 Path E.e
 CPPipe env:CompletionPipeSubmodules envFromCompletionItem:CompletionPipeSubmodules.D
 CPPipe type path:C2.t2
+CPPipe pathFromEnv:D.C2 found:true
 Path D.C2.
 [{
     "label": "D.C2.C2",