Remove ignore_infer configuration option

Reviewed By: stroxler

Differential Revision: D30196050

fbshipit-source-id: 6ea60351dfc4f6c674798195959dff3519e3e560

Author: grievejia

source/command/inferCommand.ml

@@ -17,7 +17,7 @@ let argument_to_paths argument =
 
 
 let run_infer_interprocedural
-    ignore_infer
+    _ignore_infer
     _verbose
     expected_version
     sections
@@ -59,7 +59,6 @@ let run_infer_interprocedural
       ~project_root
       ();
     Profiling.GlobalState.initialize ?profiling_output ?memory_profiling_output ();
-    let ignore_infer = argument_to_paths ignore_infer in
     let filter_directories = argument_to_paths filter_directories in
     let ignore_all_errors = argument_to_paths ignore_all_errors in
     let configuration =
@@ -77,7 +76,6 @@ let run_infer_interprocedural
         ~excludes
         ~extensions:(List.map ~f:Configuration.Extension.create_extension extensions)
         ?log_directory
-        ?ignore_infer
         ?python_major_version
         ?python_minor_version
         ?python_micro_version
@@ -160,7 +158,7 @@ let run_infer_interprocedural
 
 
 let run_infer_local
-    ignore_infer
+    _ignore_infer
     _verbose
     expected_version
     sections
@@ -202,7 +200,6 @@ let run_infer_local
       ~project_root
       ();
     Profiling.GlobalState.initialize ?profiling_output ?memory_profiling_output ();
-    let ignore_infer = argument_to_paths ignore_infer in
     let filter_directories = argument_to_paths filter_directories in
     let ignore_all_errors = argument_to_paths ignore_all_errors in
     let configuration =
@@ -220,7 +217,6 @@ let run_infer_local
         ~excludes
         ~extensions:(List.map ~f:Configuration.Extension.create_extension extensions)
         ?log_directory
-        ?ignore_infer
         ?python_major_version
         ?python_minor_version
         ?python_micro_version

source/command/newInferCommand.ml

@@ -38,7 +38,6 @@ module InferConfiguration = struct
     excludes: string list;
     checked_directory_allowlist: Path.t list;
     checked_directory_blocklist: Path.t list;
-    ignore_infer: Path.t list;
     extensions: Configuration.Extension.t list;
     (* Auxiliary paths *)
     log_path: Path.t;
@@ -85,7 +84,6 @@ module InferConfiguration = struct
       let checked_directory_blocklist =
         json |> path_list_member "checked_directory_blocklist" ~default:[]
       in
-      let ignore_infer = json |> path_list_member "ignore_infer" ~default:[] in
       let extensions =
         json
         |> string_list_member "extensions" ~default:[]
@@ -131,7 +129,6 @@ module InferConfiguration = struct
           excludes;
           checked_directory_allowlist;
           checked_directory_blocklist;
-          ignore_infer;
           extensions;
           log_path;
           global_root;
@@ -160,7 +157,6 @@ module InferConfiguration = struct
         excludes;
         checked_directory_allowlist;
         checked_directory_blocklist;
-        ignore_infer;
         extensions;
         log_path;
         global_root;
@@ -183,7 +179,6 @@ module InferConfiguration = struct
       | Buck { Configuration.Buck.artifact_root; _ } -> [SearchPath.Root artifact_root]
     in
     Configuration.Analysis.create
-      ~ignore_infer
       ~parallel
       ~analyze_external_sources:false
       ~filter_directories:checked_directory_allowlist

source/command/newInferCommand.mli

@@ -21,7 +21,6 @@ module InferConfiguration : sig
     excludes: string list;
     checked_directory_allowlist: PyrePath.t list;
     checked_directory_blocklist: PyrePath.t list;
-    ignore_infer: PyrePath.t list;
     extensions: Configuration.Extension.t list;
     log_path: PyrePath.t;
     global_root: PyrePath.t;

source/command/test/newInferTest.ml

@@ -37,7 +37,6 @@ let test_json_parsing context =
         "excludes": ["/excludes"],
         "checked_directory_allowlist": ["/allows"],
         "checked_directory_blocklist": ["/blocks"],
-        "ignore_infer": ["/ignored"],
         "extensions": [".typsy"],
         "infer_mode": ["Local"],
         "debug": true,
@@ -68,7 +67,6 @@ let test_json_parsing context =
         excludes = ["/excludes"];
         checked_directory_allowlist = [Path.create_absolute "/allows"];
         checked_directory_blocklist = [Path.create_absolute "/blocks"];
-        ignore_infer = [Path.create_absolute "/ignored"];
         extensions = [Configuration.Extension.create_extension ".typsy"];
         log_path = Path.create_absolute "/log";
         global_root = Path.create_absolute "/project";

source/configuration.ml

@@ -277,7 +277,6 @@ module Analysis = struct
     include_hints: bool;
     perform_autocompletion: bool;
     features: Features.t;
-    ignore_infer: Path.t list;
     log_directory: Path.t;
     python_major_version: int;
     python_minor_version: int;
@@ -313,7 +312,6 @@ module Analysis = struct
       ?(include_hints = false)
       ?(perform_autocompletion = false)
       ?(features = Features.default)
-      ?(ignore_infer = [])
       ?log_directory
       ?(python_major_version = default_python_major_version)
       ?(python_minor_version = default_python_minor_version)
@@ -353,7 +351,6 @@ module Analysis = struct
       include_hints;
       perform_autocompletion;
       features;
-      ignore_infer;
       log_directory =
         (match log_directory with
         | Some directory -> Path.create_absolute directory

source/configuration.mli

@@ -118,7 +118,6 @@ module Analysis : sig
     include_hints: bool;
     perform_autocompletion: bool;
     features: Features.t;
-    ignore_infer: Path.t list;
     log_directory: Path.t;
     python_major_version: int;
     python_minor_version: int;
@@ -149,7 +148,6 @@ module Analysis : sig
     ?include_hints:bool ->
     ?perform_autocompletion:bool ->
     ?features:Features.t ->
-    ?ignore_infer:Path.t list ->
     ?log_directory:string ->
     ?python_major_version:int ->
     ?python_minor_version:int ->

source/interprocedural_analyses/type_inference/test/typeInferenceGlobalTest.ml

@@ -295,57 +295,12 @@ let attribute_widen_test context =
     ()
 
 
-let ignore_infer_test context =
-  let assert_fixpoint_result =
-    assert_fixpoint_result
-      ~context
-      ~sources:["test.py", {|
-          x = 1 + 1
-          |}]
-      ~callable_names:["test.$toplevel"]
-  in
-  assert_fixpoint_result
-    ~expected:
-      {|
-        {
-          "globals": [
-            {
-              "name": "x",
-              "location": { "qualifier": "test", "path": "test.py", "line": 2 },
-              "annotation": "int"
-            }
-          ],
-          "attributes": [],
-          "defines": []
-        }
-      |}
-    ();
-  assert_fixpoint_result
-    ~transform_configuration:(fun configuration ->
-      {
-        configuration with
-        Configuration.Analysis.ignore_infer =
-          [PyrePath.create_relative ~root:configuration.local_root ~relative:"test.py"];
-      })
-    ~expected:
-      {|
-        {
-          "globals": [],
-          "attributes": [],
-          "defines": []
-        }
-      |}
-    ();
-  ()
-
-
 let () =
   "typeInferenceAnalysisTest"
   >::: [
          "serialization" >:: serialization_test;
          "duplicates" >:: duplicate_define_test;
          "suppress" >:: suppress_test;
          "attribute_widen" >:: attribute_widen_test;
-         "ignore_infer" >:: ignore_infer_test;
        ]
   |> Test.run

source/interprocedural_analyses/type_inference/typeInferenceAnalysis.ml

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-open Core
 open Analysis
 open Interprocedural
 
@@ -33,8 +32,7 @@ module Analyzer = struct
     let maybe_source = AstEnvironment.ReadOnly.get_processed_source ast_environment qualifier in
     let result =
       match maybe_source with
-      | Some ({ Ast.Source.source_path; _ } as source)
-        when not (TypeInferenceLocal.skip_infer ~configuration source_path) ->
+      | Some source ->
           TypeInferenceLocal.infer_for_define
             ~configuration
             ~global_resolution

source/interprocedural_analyses/type_inference/typeInferenceLocal.ml

@@ -972,17 +972,6 @@ let legacy_infer_for_define
         []
 
 
-let skip_infer
-    ~configuration:({ Configuration.Analysis.ignore_infer; _ } as configuration)
-    source_path
-  =
-  try
-    let path = Ast.SourcePath.full_path ~configuration source_path in
-    source_path.is_stub or List.exists ignore_infer ~f:(Path.equal path)
-  with
-  | Unix.Unix_error (Unix.ENOENT, _, _) -> true
-
-
 let infer_for_define ~configuration ~global_resolution ~source ~qualifier ~define =
   let abstract =
     let { Node.value = { Define.signature; _ }; _ } = define in
@@ -1028,11 +1017,8 @@ let infer_for_module
     ~global_resolution
     ~source:({ Ast.Source.source_path = { qualifier; _ } as source_path; _ } as source)
   =
-  if skip_infer ~configuration source_path then
-    []
-  else (
-    Log.debug "Running infer for %s..." source_path.relative;
-    let check define =
-      infer_for_define ~configuration ~global_resolution ~source ~qualifier ~define
-    in
-    source |> Preprocessing.defines ~include_toplevels:true |> List.map ~f:check)
+  Log.debug "Running infer for %s..." source_path.relative;
+  let check define =
+    infer_for_define ~configuration ~global_resolution ~source ~qualifier ~define
+  in
+  source |> Preprocessing.defines ~include_toplevels:true |> List.map ~f:check

source/interprocedural_analyses/type_inference/typeInferenceLocal.mli

@@ -29,8 +29,6 @@ end
 
 module State (Context : Context) : Signature
 
-val skip_infer : configuration:Configuration.Analysis.t -> Ast.SourcePath.t -> bool
-
 val infer_for_define
   :  configuration:Configuration.Analysis.t ->
   global_resolution:Analysis.GlobalResolution.t ->