Perform build system lookup when processing types() request

Reviewed By: dkgi

Differential Revision: D30146032

fbshipit-source-id: 97bf97c6034edc01a14120a7a58a18968d727aea

Author: grievejia

source/new_server/lookupProcessor.ml

@@ -24,7 +24,7 @@ type lookup = {
   lookup: (Lookup.t, error_reason) Result.t;
 }
 
-let get_lookups ~configuration ~build_system:_ ~environment paths =
+let get_lookups ~configuration ~build_system ~environment paths =
   let generate_lookup_for_existent_path (path, { SourcePath.qualifier; _ }) =
     let lookup = Lookup.create_of_module (TypeEnvironment.read_only environment) qualifier in
     { path; lookup = Result.Ok lookup }
@@ -37,13 +37,19 @@ let get_lookups ~configuration ~build_system:_ ~environment paths =
       let { Configuration.Analysis.local_root = root; _ } = configuration in
       Path.create_relative ~root ~relative:path
     in
-    let module_tracker = TypeEnvironment.module_tracker environment in
-    match ModuleTracker.lookup_path ~configuration module_tracker full_path with
-    | ModuleTracker.PathLookup.Found source_path ->
-        generate_lookup_for_existent_path (path, source_path)
-    | ModuleTracker.PathLookup.ShadowedBy _ ->
-        generate_lookup_for_nonexistent_path (path, StubShadowing)
-    | ModuleTracker.PathLookup.NotFound -> generate_lookup_for_nonexistent_path (path, FileNotFound)
+    match BuildSystem.lookup_artifact build_system full_path with
+    | [] -> generate_lookup_for_nonexistent_path (path, FileNotFound)
+    | artifact_path :: _ -> (
+        (* If a source path corresponds to multiple artifacts, randomly pick an artifact and compute
+           results for it. *)
+        let module_tracker = TypeEnvironment.module_tracker environment in
+        match ModuleTracker.lookup_path ~configuration module_tracker artifact_path with
+        | ModuleTracker.PathLookup.Found source_path ->
+            generate_lookup_for_existent_path (path, source_path)
+        | ModuleTracker.PathLookup.ShadowedBy _ ->
+            generate_lookup_for_nonexistent_path (path, StubShadowing)
+        | ModuleTracker.PathLookup.NotFound ->
+            generate_lookup_for_nonexistent_path (path, FileNotFound))
   in
   List.map paths ~f:generate_lookup_for_path
 

source/new_server/test/newServerTest.ml

@@ -79,6 +79,7 @@ module ScratchProject = struct
       ?(external_sources = [])
       ?(include_typeshed_stubs = true)
       ?(include_helper_builtins = true)
+      ?custom_source_root
       ?watchman
       ?build_system_initializer
       sources
@@ -90,7 +91,11 @@ module ScratchProject = struct
     in
     (* We assume that there's only one checked source directory that acts as the global root as
        well. *)
-    let source_root = bracket_tmpdir context |> Path.create_absolute ~follow_symbolic_links:true in
+    let source_root =
+      match custom_source_root with
+      | Some source_root -> source_root
+      | None -> bracket_tmpdir context |> Path.create_absolute ~follow_symbolic_links:true
+    in
     (* We assume that there's only one external source directory. *)
     let external_root =
       bracket_tmpdir context |> Path.create_absolute ~follow_symbolic_links:true

source/new_server/test/newServerTest.mli

@@ -37,6 +37,7 @@ module ScratchProject : sig
     ?external_sources:(string * string) list ->
     ?include_typeshed_stubs:bool ->
     ?include_helper_builtins:bool ->
+    ?custom_source_root:Pyre.Path.t ->
     ?watchman:Watchman.Raw.t ->
     ?build_system_initializer:BuildSystem.Initializer.t ->
     (* A list of test sources specified in the form of (relative_path, content) *)

source/new_server/test/queryTest.ml

@@ -897,6 +897,42 @@ let test_handle_query_basic context =
   Lwt.return_unit
 
 
+let test_handle_types_query_with_build_system context =
+  let custom_source_root =
+    bracket_tmpdir context |> Path.create_absolute ~follow_symbolic_links:true
+  in
+  let build_system_initializer =
+    let initialize () =
+      let lookup_artifact _ =
+        [Path.create_relative ~root:custom_source_root ~relative:"redirected.py"]
+      in
+      Lwt.return (BuildSystem.create_for_testing ~lookup_artifact ())
+    in
+    let load () = failwith "saved state loading is not supported" in
+    BuildSystem.Initializer.create_for_testing ~initialize ~load ()
+  in
+  let test_types_query client =
+    let open Lwt.Infix in
+    Client.send_request client (Request.Query "types('original.py')")
+    >>= fun actual_response ->
+    let expected_response =
+      Response.Query
+        Query.Response.(Single (Base.TypesByPath [{ Base.path = "original.py"; types = [] }]))
+      |> Response.to_yojson
+      |> Yojson.Safe.to_string
+    in
+    assert_equal ~ctxt:context ~cmp:String.equal ~printer:Fn.id expected_response actual_response;
+    Lwt.return_unit
+  in
+  ScratchProject.setup
+    ~context
+    ~include_helper_builtins:false
+    ~build_system_initializer
+    ~custom_source_root
+    ["original.py", "x: int = 42"; "redirected.py", ""]
+  |> ScratchProject.test_server_with ~f:test_types_query
+
+
 let test_handle_query_pysa context =
   let queries_and_expected_responses =
     [
@@ -1272,6 +1308,8 @@ let () =
   >::: [
          "parse_query" >:: test_parse_query;
          "handle_query_basic" >:: OUnitLwt.lwt_wrapper test_handle_query_basic;
+         "handle_types_query_with_build_system"
+         >:: OUnitLwt.lwt_wrapper test_handle_types_query_with_build_system;
          "handle_query_pysa" >:: OUnitLwt.lwt_wrapper test_handle_query_pysa;
          "inline_decorators" >:: OUnitLwt.lwt_wrapper test_inline_decorators;
        ]