Refactor from_reconstructed

src/analysis/type_enclosing.ml

@@ -37,8 +37,9 @@ let from_nodes ~path =
   in
   List.filter_map ~f:aux path
 
-let from_reconstructed ~get_context ~verbosity env node exprs =
+let from_reconstructed ~nodes ~cursor ~verbosity exprs =
   let open Browse_raw in
+  let env, node = Mbrowse.leaf_node nodes in
   log ~title:"from_reconstructed" "node = %s\nexprs = [%s]"
     (Browse_raw.string_of_node node)
     (String.concat ~sep:";" (List.map exprs ~f:(fun l ->
@@ -58,6 +59,14 @@ let from_reconstructed ~get_context ~verbosity env node exprs =
       -> false
     | _ -> true
   in
+
+  let get_context lident =
+    Context.inspect_browse_tree
+      ~cursor
+      (Longident.parse lident)
+      [nodes]
+  in
+
   let f =
     fun {Location. txt = source; loc} ->
       let context = get_context source in

src/analysis/type_enclosing.mli

@@ -48,9 +48,8 @@ val from_nodes :
   typed_enclosings
 
 val from_reconstructed :
-  get_context:(string -> Context.t option) ->
+  nodes:(Env.t * Browse_raw.node) list ->
+  cursor:Lexing.position ->
   verbosity:int ->
-  Env.t ->
-  Mbrowse.node ->
   string Location.loc list ->
   typed_enclosings

src/frontend/query_commands.ml

@@ -298,17 +298,10 @@ let dispatch pipeline (type a) : a Query_protocol.t -> a =
           `List lst
         )
     in
-    let env, node = Mbrowse.leaf_node (Mtyper.node_at typer pos) in
-    let get_context lident =
-      Context.inspect_browse_tree
-        ~cursor:pos
-        (Longident.parse lident)
-        [Mtyper.node_at typer pos]
-    in
+    let nodes = Mtyper.node_at typer pos in
     let small_enclosings =
-      Type_enclosing.from_reconstructed
-        ~get_context ~verbosity
-        env node exprs
+      Type_enclosing.from_reconstructed exprs
+       ~nodes ~cursor:pos ~verbosity
     in
     Logger.log ~section:Type_enclosing.log_section ~title:"small enclosing" "%a"
       Logger.fmt (fun fmt ->