Avoid returning full paths for types() query

grievejia · facebook-github-bot · commit 4e33e83c697b · 2021-08-05T21:09:53.000-07:00
Reviewed By: dkgi

Differential Revision: D30146026

fbshipit-source-id: b5b955dfdb7883ac95fd7c4309067885bde41e56
diff --git a/source/new_server/lookupProcessor.ml b/source/new_server/lookupProcessor.ml
@@ -8,18 +8,19 @@
 open Core
 open Ast
 open Analysis
+module Path = PyrePath
 
 type error_reason =
   | StubShadowing
   | FileNotFound
 
 type types_by_path = {
-  path: PyrePath.t;
+  path: string;
   types_by_location: ((Location.t * Type.t) list, error_reason) Result.t;
 }
 
 type lookup = {
-  path: PyrePath.t;
+  path: string;
   lookup: (Lookup.t, error_reason) Result.t;
 }
 
@@ -32,8 +33,12 @@ let get_lookups ~configuration ~build_system:_ ~environment paths =
     { path; lookup = Result.Error error_reason }
   in
   let generate_lookup_for_path path =
+    let full_path =
+      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 path with
+    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 _ ->
@@ -43,7 +48,7 @@ let get_lookups ~configuration ~build_system:_ ~environment paths =
   List.map paths ~f:generate_lookup_for_path
 
 
-let find_all_annotations_batch ~environment ~build_system ~configuration ~paths =
+let find_all_annotations_batch ~environment ~build_system ~configuration paths =
   let get_annotations { path; lookup; _ } =
     {
       path;
diff --git a/source/new_server/lookupProcessor.mli b/source/new_server/lookupProcessor.mli
@@ -13,7 +13,7 @@ type error_reason =
   | FileNotFound
 
 type types_by_path = {
-  path: PyrePath.t;
+  path: string;
   types_by_location: ((Location.t * Type.t) list, error_reason) Core.Result.t;
 }
 
@@ -25,5 +25,5 @@ val find_all_annotations_batch
   :  environment:TypeEnvironment.t ->
   build_system:BuildSystem.t ->
   configuration:Configuration.Analysis.t ->
-  paths:PyrePath.t list ->
+  string list ->
   types_by_path list
diff --git a/source/new_server/query.ml b/source/new_server/query.ml
@@ -63,7 +63,7 @@ module Response = struct
     [@@deriving sexp, compare, to_yojson]
 
     type types_at_path = {
-      path: PyrePath.t;
+      path: string;
       types: type_at_location list;
     }
     [@@deriving sexp, compare, to_yojson]
@@ -512,10 +512,9 @@ let rec process_request ~environment ~build_system ~configuration request =
             | LookupProcessor.FileNotFound -> " (file not found)"
           in
           Format.asprintf
-            "%s%s`%a`%s"
+            "%s%s`%s`%s"
             sofar
             (if String.is_empty sofar then "" else ", ")
-            PyrePath.pp
             path
             (print_reason error_reason))
         errors
@@ -719,16 +718,8 @@ let rec process_request ~environment ~build_system ~configuration request =
         let annotation = Resolution.resolve_expression_to_type resolution expression in
         Single (Type annotation)
     | TypesInFiles paths ->
-        let paths =
-          let { Configuration.Analysis.local_root = root; _ } = configuration in
-          List.map ~f:(fun path -> Path.create_relative ~root ~relative:path) paths
-        in
         let annotations =
-          LookupProcessor.find_all_annotations_batch
-            ~environment
-            ~build_system
-            ~configuration
-            ~paths
+          LookupProcessor.find_all_annotations_batch ~environment ~build_system ~configuration paths
         in
         let create_result { LookupProcessor.path; types_by_location } =
           match types_by_location with
diff --git a/source/new_server/query.mli b/source/new_server/query.mli
@@ -56,7 +56,7 @@ module Response : sig
     [@@deriving sexp, compare, to_yojson]
 
     type types_at_path = {
-      path: PyrePath.t;
+      path: string;
       types: type_at_location list;
     }
     [@@deriving sexp, compare, to_yojson]
diff --git a/source/new_server/test/queryTest.ml b/source/new_server/test/queryTest.ml
@@ -374,12 +374,12 @@ let test_handle_query_basic context =
         a = 42
     |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -434,12 +434,12 @@ let test_handle_query_basic context =
         return x
     |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -492,12 +492,12 @@ let test_handle_query_basic context =
         y = 3
      |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    2, 0, 2, 1, Type.integer;
@@ -516,12 +516,12 @@ let test_handle_query_basic context =
          x = 1
     |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -554,12 +554,12 @@ let test_handle_query_basic context =
           y = 1
      |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -597,12 +597,12 @@ let test_handle_query_basic context =
             y = 2
       |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -636,12 +636,12 @@ let test_handle_query_basic context =
         y = 2
     |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    2, 5, 2, 11, Type.Any;
@@ -659,12 +659,12 @@ let test_handle_query_basic context =
         y = 1
    |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    2, 6, 2, 15, Type.bool;
@@ -685,12 +685,12 @@ let test_handle_query_basic context =
          return x
     |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -735,12 +735,12 @@ let test_handle_query_basic context =
         pass
     |}
     ~query:"types(path='test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    ( 2,
@@ -780,12 +780,12 @@ let test_handle_query_basic context =
          x = 1
      |}
     ~query:"types('test.py')"
-    (fun local_root ->
+    (fun _ ->
       Single
         (Base.TypesByPath
            [
              {
-               Base.path = Path.create_relative ~root:local_root ~relative:"test.py";
+               Base.path = "test.py";
                types =
                  [
                    {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ module Response : sig`
`56`	`56`	`[@@deriving sexp, compare, to_yojson]`
`57`	`57`
`58`	`58`	`type types_at_path = {`
`59`		`- path: PyrePath.t;`
	`59`	`+ path: string;`
`60`	`60`	`types: type_at_location list;`
`61`	`61`	`}`
`62`	`62`	`[@@deriving sexp, compare, to_yojson]`
Original file line number	Diff line number	Diff line change
`@@ -374,12 +374,12 @@ let test_handle_query_basic context =`
`374`	`374`	`a = 42`
`375`	`375`	`\|}`
`376`	`376`	`~query:"types(path='test.py')"`
`377`		`- (fun local_root ->`
	`377`	`+ (fun _ ->`
`378`	`378`	`Single`
`379`	`379`	`(Base.TypesByPath`
`380`	`380`	`[`
`381`	`381`	`{`
`382`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`382`	`+ Base.path = "test.py";`
`383`	`383`	`types =`
`384`	`384`	`[`
`385`	`385`	`( 2,`
`@@ -434,12 +434,12 @@ let test_handle_query_basic context =`
`434`	`434`	`return x`
`435`	`435`	`\|}`
`436`	`436`	`~query:"types(path='test.py')"`
`437`		`- (fun local_root ->`
	`437`	`+ (fun _ ->`
`438`	`438`	`Single`
`439`	`439`	`(Base.TypesByPath`
`440`	`440`	`[`
`441`	`441`	`{`
`442`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`442`	`+ Base.path = "test.py";`
`443`	`443`	`types =`
`444`	`444`	`[`
`445`	`445`	`( 2,`
`@@ -492,12 +492,12 @@ let test_handle_query_basic context =`
`492`	`492`	`y = 3`
`493`	`493`	`\|}`
`494`	`494`	`~query:"types(path='test.py')"`
`495`		`- (fun local_root ->`
	`495`	`+ (fun _ ->`
`496`	`496`	`Single`
`497`	`497`	`(Base.TypesByPath`
`498`	`498`	`[`
`499`	`499`	`{`
`500`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`500`	`+ Base.path = "test.py";`
`501`	`501`	`types =`
`502`	`502`	`[`
`503`	`503`	`2, 0, 2, 1, Type.integer;`
`@@ -516,12 +516,12 @@ let test_handle_query_basic context =`
`516`	`516`	`x = 1`
`517`	`517`	`\|}`
`518`	`518`	`~query:"types(path='test.py')"`
`519`		`- (fun local_root ->`
	`519`	`+ (fun _ ->`
`520`	`520`	`Single`
`521`	`521`	`(Base.TypesByPath`
`522`	`522`	`[`
`523`	`523`	`{`
`524`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`524`	`+ Base.path = "test.py";`
`525`	`525`	`types =`
`526`	`526`	`[`
`527`	`527`	`( 2,`
`@@ -554,12 +554,12 @@ let test_handle_query_basic context =`
`554`	`554`	`y = 1`
`555`	`555`	`\|}`
`556`	`556`	`~query:"types(path='test.py')"`
`557`		`- (fun local_root ->`
	`557`	`+ (fun _ ->`
`558`	`558`	`Single`
`559`	`559`	`(Base.TypesByPath`
`560`	`560`	`[`
`561`	`561`	`{`
`562`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`562`	`+ Base.path = "test.py";`
`563`	`563`	`types =`
`564`	`564`	`[`
`565`	`565`	`( 2,`
`@@ -597,12 +597,12 @@ let test_handle_query_basic context =`
`597`	`597`	`y = 2`
`598`	`598`	`\|}`
`599`	`599`	`~query:"types(path='test.py')"`
`600`		`- (fun local_root ->`
	`600`	`+ (fun _ ->`
`601`	`601`	`Single`
`602`	`602`	`(Base.TypesByPath`
`603`	`603`	`[`
`604`	`604`	`{`
`605`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`605`	`+ Base.path = "test.py";`
`606`	`606`	`types =`
`607`	`607`	`[`
`608`	`608`	`( 2,`
`@@ -636,12 +636,12 @@ let test_handle_query_basic context =`
`636`	`636`	`y = 2`
`637`	`637`	`\|}`
`638`	`638`	`~query:"types(path='test.py')"`
`639`		`- (fun local_root ->`
	`639`	`+ (fun _ ->`
`640`	`640`	`Single`
`641`	`641`	`(Base.TypesByPath`
`642`	`642`	`[`
`643`	`643`	`{`
`644`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`644`	`+ Base.path = "test.py";`
`645`	`645`	`types =`
`646`	`646`	`[`
`647`	`647`	`2, 5, 2, 11, Type.Any;`
`@@ -659,12 +659,12 @@ let test_handle_query_basic context =`
`659`	`659`	`y = 1`
`660`	`660`	`\|}`
`661`	`661`	`~query:"types(path='test.py')"`
`662`		`- (fun local_root ->`
	`662`	`+ (fun _ ->`
`663`	`663`	`Single`
`664`	`664`	`(Base.TypesByPath`
`665`	`665`	`[`
`666`	`666`	`{`
`667`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`667`	`+ Base.path = "test.py";`
`668`	`668`	`types =`
`669`	`669`	`[`
`670`	`670`	`2, 6, 2, 15, Type.bool;`
`@@ -685,12 +685,12 @@ let test_handle_query_basic context =`
`685`	`685`	`return x`
`686`	`686`	`\|}`
`687`	`687`	`~query:"types(path='test.py')"`
`688`		`- (fun local_root ->`
	`688`	`+ (fun _ ->`
`689`	`689`	`Single`
`690`	`690`	`(Base.TypesByPath`
`691`	`691`	`[`
`692`	`692`	`{`
`693`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`693`	`+ Base.path = "test.py";`
`694`	`694`	`types =`
`695`	`695`	`[`
`696`	`696`	`( 2,`
`@@ -735,12 +735,12 @@ let test_handle_query_basic context =`
`735`	`735`	`pass`
`736`	`736`	`\|}`
`737`	`737`	`~query:"types(path='test.py')"`
`738`		`- (fun local_root ->`
	`738`	`+ (fun _ ->`
`739`	`739`	`Single`
`740`	`740`	`(Base.TypesByPath`
`741`	`741`	`[`
`742`	`742`	`{`
`743`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`743`	`+ Base.path = "test.py";`
`744`	`744`	`types =`
`745`	`745`	`[`
`746`	`746`	`( 2,`
`@@ -780,12 +780,12 @@ let test_handle_query_basic context =`
`780`	`780`	`x = 1`
`781`	`781`	`\|}`
`782`	`782`	`~query:"types('test.py')"`
`783`		`- (fun local_root ->`
	`783`	`+ (fun _ ->`
`784`	`784`	`Single`
`785`	`785`	`(Base.TypesByPath`
`786`	`786`	`[`
`787`	`787`	`{`
`788`		`- Base.path = Path.create_relative ~root:local_root ~relative:"test.py";`
	`788`	`+ Base.path = "test.py";`
`789`	`789`	`types =`
`790`	`790`	`[`
`791`	`791`	`{`