Back out "Add include_tests to the EqwalizerIncludes struct"

Summary:
Original commit changeset: 7eb413e30af9

Original Phabricator Diff: D65346240

Reviewed By: ilya-klyuchnikov

Differential Revision: D65420062

fbshipit-source-id: 235967246fab49d7182c10adb47b35cc35a8705d

crates/elp/src/bin/eqwalizer_cli.rs

@@ -144,7 +144,7 @@ pub fn do_eqwalize_all(
     set_eqwalizer_config(loaded, args.clause_coverage);
     let analysis = &loaded.analysis();
     let module_index = analysis.module_index(loaded.project_id)?;
-    let eqwalizer_includes = EqwalizerIncludes::none().set_generated(args.include_generated.into());
+    let eqwalizer_includes = EqwalizerIncludes::new().set_generated(args.include_generated.into());
     let pb = cli.progress(module_index.len_own() as u64, "Gathering modules");
     let file_ids: Vec<FileId> = module_index
         .iter_own()
@@ -212,7 +212,7 @@ pub fn do_eqwalize_app(
     set_eqwalizer_config(loaded, args.clause_coverage);
     let analysis = &loaded.analysis();
     let module_index = analysis.module_index(loaded.project_id)?;
-    let eqwalizer_includes = EqwalizerIncludes::none().set_generated(args.include_generated.into());
+    let eqwalizer_includes = EqwalizerIncludes::new().set_generated(args.include_generated.into());
     let file_ids: Vec<FileId> = module_index
         .iter_own()
         .filter_map(|(_name, _source, file_id)| {
@@ -262,7 +262,7 @@ pub fn eqwalize_target(
     let buck_target = buck_target.strip_suffix(':').unwrap_or(buck_target);
 
     let analysis = &loaded.analysis();
-    let eqwalizer_includes = EqwalizerIncludes::none().set_generated(args.include_generated.into());
+    let eqwalizer_includes = EqwalizerIncludes::new().set_generated(args.include_generated.into());
     let mut file_ids: Vec<FileId> = Default::default();
     let mut at_least_one_found = false;
     let exact_match = buck_target.contains(':');
@@ -330,7 +330,7 @@ pub fn eqwalize_stats(
     build::compile_deps(&loaded, cli)?;
     let analysis = &loaded.analysis();
     let module_index = analysis.module_index(loaded.project_id)?;
-    let eqwalizer_includes = EqwalizerIncludes::none().set_generated(args.include_generated.into());
+    let eqwalizer_includes = EqwalizerIncludes::new().set_generated(args.include_generated.into());
     let project_id = loaded.project_id;
     let pb = cli.progress(module_index.len_own() as u64, "Computing stats");
     let stats: FxHashMap<FileId, (ModuleName, Vec<Diagnostic>)> = module_index

crates/elp/src/bin/glean.rs

@@ -1371,7 +1371,7 @@ impl GleanIndexer {
         vars: FxHashMap<&Location, &String>,
     ) -> Vec<VarDecl> {
         let mut result = vec![];
-        if !db.is_eqwalizer_enabled(file_id, EqwalizerIncludes::none()) {
+        if !db.is_eqwalizer_enabled(file_id, EqwalizerIncludes::new()) {
             return result;
         }
         let module_diagnostics = db.eqwalizer_diagnostics_by_project(project_id, vec![file_id]);

crates/elp/src/bin/lint_cli.rs

@@ -195,7 +195,7 @@ fn do_parse_one(
             if let Some(diags) = db
                 .eqwalizer_diagnostics_for_file(
                     file_id,
-                    EqwalizerIncludes::none().set_generated(args.include_generated.into()),
+                    EqwalizerIncludes::new().set_generated(args.include_generated.into()),
                 )
                 .unwrap()
             {
@@ -207,7 +207,7 @@ fn do_parse_one(
         if let Some(diags) = db
             .eqwalizer_diagnostics_for_file(
                 file_id,
-                EqwalizerIncludes::none().set_generated(args.include_generated.into()),
+                EqwalizerIncludes::new().set_generated(args.include_generated.into()),
             )
             .unwrap()
         {

crates/elp/src/bin/reporting.rs

@@ -223,7 +223,7 @@ impl<'a> Reporter for JsonReporter<'a> {
         let line_index = self.analysis.line_index(file_id)?;
         let eqwalizer_enabled = self
             .analysis
-            .is_eqwalizer_enabled(file_id, EqwalizerIncludes::none().include_generated())
+            .is_eqwalizer_enabled(file_id, EqwalizerIncludes::new().generated())
             .unwrap();
         let file_path = &self.loaded.vfs.file_path(file_id);
         let root_path = &self

crates/elp/src/server.rs

@@ -1533,7 +1533,7 @@ impl Server {
                 let file_id = files.remove(files.len() - 1);
                 match snapshot.update_cache_for_file(
                     file_id,
-                    EqwalizerIncludes::none(),
+                    EqwalizerIncludes::new(),
                     eqwalize_all,
                 ) {
                     Ok(_) => {}
@@ -1574,7 +1574,7 @@ impl Server {
             for (_, _, file_id) in module_index.iter_own() {
                 match snapshot
                     .analysis
-                    .should_eqwalize(file_id, EqwalizerIncludes::none())
+                    .should_eqwalize(file_id, EqwalizerIncludes::new())
                 {
                     Ok(true) => {
                         files.push(file_id);

crates/elp/src/snapshot.rs

@@ -213,7 +213,7 @@ impl Snapshot {
         let file_url = self.file_id_to_url(file_id);
         let _timer = timeit_with_telemetry!(TelemetryData::EqwalizerDiagnostics { file_url });
         self.analysis
-            .eqwalizer_diagnostics_for_file(file_id, EqwalizerIncludes::none().include_generated())
+            .eqwalizer_diagnostics_for_file(file_id, EqwalizerIncludes::new().generated())
             .ok()?
     }
 
@@ -229,7 +229,7 @@ impl Snapshot {
             .filter_map(|(_, _, file_id)| {
                 if let Ok(true) = self
                     .analysis
-                    .should_eqwalize(file_id, EqwalizerIncludes::none())
+                    .should_eqwalize(file_id, EqwalizerIncludes::new())
                 {
                     Some(file_id)
                 } else {

crates/elp/tests/slow-tests/buck_tests.rs

@@ -71,7 +71,7 @@ mod tests {
                 .unwrap();
             assert_eq!(ast.errors, vec![]);
             let eq_enabled = analysis
-                .is_eqwalizer_enabled(file_id, EqwalizerIncludes::none())
+                .is_eqwalizer_enabled(file_id, EqwalizerIncludes::new())
                 .expect(&format!(
                     "Failed to check if eqwalizer enabled for {module}"
                 ));

crates/ide/src/fixture.rs

@@ -137,7 +137,7 @@ pub fn diagnostics_for(
         }
     }
     if *use_eqwalizer {
-        let eqwalizer_includes = EqwalizerIncludes::none().include_generated();
+        let eqwalizer_includes = EqwalizerIncludes::new().generated();
         if let Some(diags) = analysis
             .eqwalizer_diagnostics_for_file(file_id, eqwalizer_includes)
             .unwrap()

crates/ide_db/src/eqwalizer.rs

@@ -119,7 +119,7 @@ fn type_at_position(
     db: &dyn EqwalizerDatabase,
     range: FileRange,
 ) -> Option<Arc<(eqwalizer::types::Type, FileRange)>> {
-    if !db.is_eqwalizer_enabled(range.file_id, EqwalizerIncludes::none().include_generated()) {
+    if !db.is_eqwalizer_enabled(range.file_id, EqwalizerIncludes::new().generated()) {
         return None;
     }
     let project_id = db.file_app_data(range.file_id)?.project_id;
@@ -154,7 +154,7 @@ fn type_at_position(
 }
 
 fn types_for_file(db: &dyn EqwalizerDatabase, file_id: FileId) -> Option<Arc<Vec<(Pos, Type)>>> {
-    if !db.is_eqwalizer_enabled(file_id, EqwalizerIncludes::none().include_generated()) {
+    if !db.is_eqwalizer_enabled(file_id, EqwalizerIncludes::new().generated()) {
         return None;
     }
     let project_id = db.file_app_data(file_id)?.project_id;

crates/types_db/src/lib.rs

@@ -32,14 +32,14 @@ pub struct EqwalizerIncludes {
 }
 
 impl EqwalizerIncludes {
-    pub fn none() -> EqwalizerIncludes {
+    pub fn new() -> EqwalizerIncludes {
         EqwalizerIncludes {
             include_generated: IncludeGenerated::No,
             include_tests: IncludeTests::No,
         }
     }
 
-    pub fn include_generated(mut self) -> EqwalizerIncludes {
+    pub fn generated(mut self) -> EqwalizerIncludes {
         self.include_generated = IncludeGenerated::Yes;
         self
     }
@@ -49,8 +49,8 @@ impl EqwalizerIncludes {
         self
     }
 
-    pub fn include_tests(mut self) -> EqwalizerIncludes {
-        self.include_tests = IncludeTests::Yes;
+    pub fn tests(mut self) -> EqwalizerIncludes {
+        self.include_generated = IncludeGenerated::Yes;
         self
     }
 }