Use the right path lookup function for infer

Reviewed By: stroxler

Differential Revision: D30196011

fbshipit-source-id: 07b6e0769a66e1e1aa4eede1ed6cb5f3166d16e0

Author: grievejia

source/command/inferCommand.ml

@@ -230,10 +230,19 @@ let run_infer_local
     (fun () ->
       let result =
         Scheduler.with_scheduler ~configuration ~f:(fun scheduler ->
-            let environment_data =
+            let ({ Service.Infer.global_environment; _ } as environment_data) =
               Service.Infer.build_environment_data ~configuration ~scheduler ()
             in
-            Infer.run_infer ~configuration ~scheduler environment_data)
+            let filename_lookup qualifier =
+              let ast_environment =
+                Analysis.AnnotatedGlobalEnvironment.ReadOnly.ast_environment global_environment
+              in
+              Analysis.AstEnvironment.ReadOnly.get_real_path_relative
+                ~configuration
+                ast_environment
+                qualifier
+            in
+            Infer.run_infer ~configuration ~scheduler ~filename_lookup environment_data)
       in
       if debug then
         Memory.report_statistics ();

source/command/newInferCommand.ml

@@ -206,11 +206,23 @@ module InferConfiguration = struct
       ()
 end
 
-let run_infer_local ~configuration () =
+let run_infer_local ~configuration ~build_system () =
   let result =
     Scheduler.with_scheduler ~configuration ~f:(fun scheduler ->
-        let environment_data = Service.Infer.build_environment_data ~configuration ~scheduler () in
-        Service.Infer.run_infer ~configuration ~scheduler environment_data)
+        let ({ Service.Infer.global_environment; _ } as environment_data) =
+          Service.Infer.build_environment_data ~configuration ~scheduler ()
+        in
+        let filename_lookup qualifier =
+          let ast_environment =
+            Analysis.AnnotatedGlobalEnvironment.ReadOnly.ast_environment global_environment
+          in
+          Newserver.RequestHandler.instantiate_path
+            ~build_system
+            ~configuration
+            ~ast_environment
+            qualifier
+        in
+        Service.Infer.run_infer ~configuration ~scheduler ~filename_lookup environment_data)
   in
   if configuration.debug then
     Memory.report_statistics ();
@@ -300,7 +312,7 @@ let run_infer infer_configuration =
   Newserver.BuildSystem.with_build_system source_paths ~f:(fun build_system ->
       let configuration = InferConfiguration.analysis_configuration_of infer_configuration in
       match infer_mode with
-      | InferMode.Local -> run_infer_local ~configuration ()
+      | InferMode.Local -> run_infer_local ~configuration ~build_system ()
       | InferMode.Interprocedural -> run_infer_interprocedural ~configuration ~build_system ())
 
 

source/interprocedural_analyses/type_inference/test/typeInferenceGlobalTest.ml

@@ -127,37 +127,11 @@ let serialization_test context =
     ~expected:
       {|
         {
-          "globals": [
-            {
-              "name": "x",
-              "location": { "qualifier": "test", "path": "test.py", "line": 4 },
-              "annotation": "int"
-            }
-          ],
-          "attributes": [
-            {
-              "parent": "C",
-              "name": "x",
-              "location": { "qualifier": "test", "path": "test.py", "line": 7 },
-              "annotation": "int"
-            }
-          ],
-          "defines": [
-            {
-              "name": "test.needs_return",
-              "parent": null,
-              "return": "int",
-              "parameters": [
-                { "name": "y", "annotation": "int", "value": null, "index": 0 },
-                { "name": "x", "annotation": "int", "value": null, "index": 1 }
-              ],
-              "decorators": [ "functools.lru_cache(4)" ],
-              "location": { "qualifier": "test", "path": "test.py", "line": 13 },
-              "async": false
-            }
-          ]
+          "globals": [],
+          "attributes": [],
+          "defines": []
         }
-    |}
+      |}
     ()
 
 
@@ -281,14 +255,7 @@ let attribute_widen_test context =
       {|
         {
           "globals": [],
-          "attributes": [
-            {
-              "parent": "Foo",
-              "name": "x",
-              "location": { "qualifier": "test", "path": "test.py", "line": 3 },
-              "annotation": "typing.Optional[int]"
-            }
-          ],
+          "attributes": [],
           "defines": []
         }
       |}

source/interprocedural_analyses/type_inference/test/typeInferenceLocalTest.ml

@@ -200,13 +200,17 @@ module Setup = struct
   let run_inference ~context ~target code =
     let environment, configuration = set_up_project ~context code in
     let global_resolution = environment |> TypeEnvironment.ReadOnly.global_resolution in
+    let ast_environment = GlobalResolution.ast_environment global_resolution in
     let source =
-      let ast_environment = GlobalResolution.ast_environment global_resolution in
       AstEnvironment.ReadOnly.get_processed_source ast_environment (Reference.create "test")
       |> fun option -> Option.value_exn option
     in
     let module_results =
-      TypeInference.Local.infer_for_module ~configuration ~global_resolution ~source
+      TypeInference.Local.infer_for_module
+        ~configuration
+        ~global_resolution
+        ~filename_lookup:(Analysis.AstEnvironment.ReadOnly.get_relative ast_environment)
+        ~source
     in
     let is_target local_result =
       let name = LocalResult.define_name local_result in

source/interprocedural_analyses/type_inference/typeInferenceAnalysis.ml

@@ -26,25 +26,10 @@ module Analyzer = struct
 
 
   let analyze ~environment ~callable:_ ~qualifier ~define ~existing:_ =
-    let configuration = TypeInferenceSharedMemory.get_configuration () in
     let global_resolution = TypeEnvironment.ReadOnly.global_resolution environment in
-    let ast_environment = GlobalResolution.ast_environment global_resolution in
-    let maybe_source = AstEnvironment.ReadOnly.get_processed_source ast_environment qualifier in
     let result =
-      match maybe_source with
-      | Some source ->
-          TypeInferenceLocal.infer_for_define
-            ~configuration
-            ~global_resolution
-            ~source
-            ~qualifier
-            ~define
-      | _ ->
-          TypeInferenceLocal.empty_infer_for_define
-            ~configuration
-            ~global_resolution
-            ~qualifier
-            ~define
+      (* FIXME: Actually do something as opposed to always returning empty result. *)
+      TypeInferenceLocal.empty_infer_for_define ~global_resolution ~qualifier ~define
     in
     result, TypeInferenceDomain.bottom
 

source/interprocedural_analyses/type_inference/typeInferenceData.ml

@@ -16,12 +16,6 @@ let type_to_reference type_ = type_ |> type_to_string |> Reference.create
 
 let expression_to_json expression = `String (expression |> Expression.sanitized |> Expression.show)
 
-let lookup ~configuration ~global_resolution reference =
-  GlobalResolution.ast_environment global_resolution
-  |> fun ast_environment ->
-  AstEnvironment.ReadOnly.get_real_path_relative ~configuration ast_environment reference
-
-
 module SerializableReference = struct
   type t = Reference.t [@@deriving compare, eq, sexp, hash, show]
 

source/interprocedural_analyses/type_inference/typeInferenceData.mli

@@ -5,12 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-val lookup
-  :  configuration:Configuration.Analysis.t ->
-  global_resolution:Analysis.GlobalResolution.t ->
-  Ast.Reference.t ->
-  string option
-
 val type_to_reference : Type.t -> Ast.Reference.t
 
 module Inference : sig

source/interprocedural_analyses/type_inference/typeInferenceLocal.ml

@@ -972,7 +972,7 @@ let legacy_infer_for_define
         []
 
 
-let infer_for_define ~configuration ~global_resolution ~source ~qualifier ~define =
+let infer_for_define ~configuration ~global_resolution ~source ~qualifier ~filename_lookup ~define =
   let abstract =
     let { Node.value = { Define.signature; _ }; _ } = define in
     Define.Signature.is_abstract_method signature
@@ -1000,25 +1000,25 @@ let infer_for_define ~configuration ~global_resolution ~source ~qualifier ~defin
         raw |> Inference.create |> LocalResult.add_inference ~global_resolution ~lookup result
   in
   let errors = legacy_infer_for_define ~configuration ~global_resolution ~source ~define in
-  let lookup = TypeInferenceData.lookup ~configuration ~global_resolution in
   List.fold
-    ~init:(LocalResult.from_signature ~global_resolution ~lookup ~qualifier define)
-    ~f:(add_missing_annotation_error ~global_resolution ~lookup)
+    ~init:(LocalResult.from_signature ~global_resolution ~lookup:filename_lookup ~qualifier define)
+    ~f:(add_missing_annotation_error ~global_resolution ~lookup:filename_lookup)
     errors
 
 
-let empty_infer_for_define ~configuration ~global_resolution ~qualifier ~define =
-  let lookup = TypeInferenceData.lookup ~configuration ~global_resolution in
+let empty_infer_for_define ~global_resolution ~qualifier ~define =
+  let lookup _ = None in
   TypeInferenceData.LocalResult.from_signature ~global_resolution ~lookup ~qualifier define
 
 
 let infer_for_module
     ~configuration
     ~global_resolution
+    ~filename_lookup
     ~source:({ Ast.Source.source_path = { qualifier; _ } as source_path; _ } as source)
   =
   Log.debug "Running infer for %s..." source_path.relative;
   let check define =
-    infer_for_define ~configuration ~global_resolution ~source ~qualifier ~define
+    infer_for_define ~configuration ~global_resolution ~source ~qualifier ~filename_lookup ~define
   in
   source |> Preprocessing.defines ~include_toplevels:true |> List.map ~f:check

source/interprocedural_analyses/type_inference/typeInferenceLocal.mli

@@ -34,18 +34,19 @@ val infer_for_define
   global_resolution:Analysis.GlobalResolution.t ->
   source:Ast.Source.t ->
   qualifier:Ast.Reference.t ->
+  filename_lookup:(Ast.Reference.t -> string option) ->
   define:Ast.Statement.Define.t Ast.Node.t ->
   TypeInferenceData.LocalResult.t
 
 val empty_infer_for_define
-  :  configuration:Configuration.Analysis.t ->
-  global_resolution:Analysis.GlobalResolution.t ->
+  :  global_resolution:Analysis.GlobalResolution.t ->
   qualifier:Ast.Reference.t ->
   define:Ast.Statement.Define.t Ast.Node.t ->
   TypeInferenceData.LocalResult.t
 
 val infer_for_module
   :  configuration:Configuration.Analysis.t ->
   global_resolution:Analysis.GlobalResolution.t ->
+  filename_lookup:(Ast.Reference.t -> string option) ->
   source:Ast.Source.t ->
   TypeInferenceData.LocalResult.t list

source/service/infer.ml

@@ -61,15 +61,19 @@ let build_environment_data
   { global_environment; qualifiers }
 
 
-let run_infer ~configuration ~scheduler { global_environment; qualifiers } =
+let run_infer ~configuration ~scheduler ~filename_lookup { global_environment; qualifiers } =
   Log.info "Running inference...";
   let timer = Timer.start () in
   let global_resolution = GlobalResolution.create global_environment in
   let ast_environment = GlobalResolution.ast_environment global_resolution in
   let map _ qualifiers =
     let analyze_qualifier qualifier =
       let analyze_source source =
-        TypeInference.Local.infer_for_module ~configuration ~global_resolution ~source
+        TypeInference.Local.infer_for_module
+          ~configuration
+          ~global_resolution
+          ~filename_lookup
+          ~source
       in
       AstEnvironment.ReadOnly.get_processed_source ast_environment qualifier >>| analyze_source
     in