[flow][oxidation] Fix toplevel command port wrt to options

Summary: Changelog: [internal]

Reviewed By: marcoww6

Differential Revision: D98753462

fbshipit-source-id: 76901ebf52f8a112bda74e653d0650ecf9a14733

Author: SamChou19815

rust_port/crates/flow_cli/src/check_commands.rs

@@ -10,6 +10,7 @@ use std::sync::Arc;
 
 use dupe::Dupe;
 use flow_common::options::Options;
+use flow_common::options::SavedStateFetcher;
 use flow_common::verbose::Verbose;
 use flow_common_errors::error_utils::ConcreteLocPrintableErrorSet;
 use flow_common_errors::error_utils::cli_output;
@@ -85,8 +86,23 @@ fn error_flags(options: &Options, show_all_errors: bool) -> cli_output::ErrorFla
     }
 }
 
+fn foreground_check_overrides(disable_saved_state: bool) -> command_utils::MakeOptionsOverrides {
+    let mut overrides = command_utils::MakeOptionsOverrides {
+        autoimports: Some(false),
+        lazy_mode: Some(false),
+        ..Default::default()
+    };
+    if disable_saved_state {
+        overrides.saved_state_fetcher = Some(SavedStateFetcher::DummyFetcher);
+        overrides.saved_state_force_recheck = Some(false);
+        overrides.saved_state_no_fallback = Some(false);
+        overrides.saved_state_skip_version_check = Some(false);
+        overrides.saved_state_verify = Some(false);
+    }
+    overrides
+}
+
 fn run_check(force_full_check: bool, args: &command_spec::Values) {
-    let _force_full_check = force_full_check;
     let flowconfig_name = command_spec::get(
         args,
         "--flowconfig-name",
@@ -118,6 +134,7 @@ fn run_check(force_full_check: bool, args: &command_spec::Values) {
         ignore_version,
         &root,
         &flowconfig_name,
+        foreground_check_overrides(force_full_check),
     );
     if strip_root {
         Arc::make_mut(&mut options).strip_root = true;
@@ -203,6 +220,7 @@ fn run_focus_check(args: &command_spec::Values) {
         ignore_version,
         &root,
         &flowconfig_name,
+        foreground_check_overrides(false),
     );
     if strip_root {
         Arc::make_mut(&mut options).strip_root = true;

rust_port/crates/flow_cli/src/command_utils.rs

@@ -18,6 +18,7 @@ use flow_common::options::Format;
 use flow_common::options::GcControl;
 use flow_common::options::LogSaving;
 use flow_common::options::Options;
+use flow_common::options::SavedStateFetcher;
 use flow_common::path_matcher::PathMatcher;
 use flow_common_exit_status::FlowExitStatus;
 use flow_data_structure_wrapper::smol_str::FlowSmolStr;
@@ -72,13 +73,25 @@ fn make_includes(
     matcher
 }
 
+#[derive(Clone, Copy, Debug, Default)]
+pub(crate) struct MakeOptionsOverrides {
+    pub(crate) autoimports: Option<bool>,
+    pub(crate) lazy_mode: Option<bool>,
+    pub(crate) saved_state_fetcher: Option<SavedStateFetcher>,
+    pub(crate) saved_state_force_recheck: Option<bool>,
+    pub(crate) saved_state_no_fallback: Option<bool>,
+    pub(crate) saved_state_skip_version_check: Option<bool>,
+    pub(crate) saved_state_verify: Option<bool>,
+}
+
 pub(super) fn make_options(
     flowconfig: FlowConfig,
     flowconfig_hash: String,
     flowconfig_name: String,
     root: std::path::PathBuf,
     temp_dir: String,
     cli_no_flowlib: bool,
+    overrides: MakeOptionsOverrides,
 ) -> Options {
     let FlowConfig {
         rollouts,
@@ -217,8 +230,18 @@ pub(super) fn make_options(
         version: _version,
     } = flowconfig;
 
+    let MakeOptionsOverrides {
+        autoimports: autoimports_override,
+        lazy_mode: lazy_mode_override,
+        saved_state_fetcher: saved_state_fetcher_override,
+        saved_state_force_recheck,
+        saved_state_no_fallback,
+        saved_state_skip_version_check: saved_state_skip_version_check_override,
+        saved_state_verify,
+    } = overrides;
+
     let all = all.unwrap_or(false);
-    let autoimports = autoimports.unwrap_or(true);
+    let autoimports = autoimports_override.unwrap_or(autoimports.unwrap_or(true));
     let autoimports_min_characters = autoimports_min_characters.unwrap_or(0) as i32;
     let autoimports_ranked_by_usage_boost_exact_match_min_length =
         autoimports_ranked_by_usage_boost_exact_match_min_length as i32;
@@ -238,10 +261,10 @@ pub(super) fn make_options(
     let enable_records = records.unwrap_or(false);
     let estimate_recheck_time = estimate_recheck_time.unwrap_or(true);
     let exact_by_default = exact_by_default.unwrap_or(true);
-    let lazy_mode = matches!(
+    let lazy_mode = lazy_mode_override.unwrap_or(matches!(
         lazy_mode,
         Some(LazyMode::Lazy) | Some(LazyMode::WatchmanDeprecated)
-    );
+    ));
     let max_files_checked_per_worker =
         max_files_checked_per_worker_rust_port.unwrap_or(max_files_checked_per_worker) as i32;
     let max_header_tokens = max_header_tokens as i32;
@@ -609,11 +632,12 @@ pub(super) fn make_options(
         relay_integration_module_prefix_includes,
         root: Arc::new(root),
         root_name: root_name.map(FlowSmolStr::new),
-        saved_state_fetcher,
-        saved_state_force_recheck: false, // Not in flowconfig, set to false
-        saved_state_no_fallback: false,   // Not in flowconfig, set to false
-        saved_state_skip_version_check,
-        saved_state_verify: false, // Not in flowconfig, set to false
+        saved_state_fetcher: saved_state_fetcher_override.unwrap_or(saved_state_fetcher),
+        saved_state_force_recheck: saved_state_force_recheck.unwrap_or(false),
+        saved_state_no_fallback: saved_state_no_fallback.unwrap_or(false),
+        saved_state_skip_version_check: saved_state_skip_version_check_override.unwrap_or(false)
+            || saved_state_skip_version_check,
+        saved_state_verify: saved_state_verify.unwrap_or(false),
         slow_to_check_logging: Default::default(), // Not in flowconfig, use default
         strict_es6_import_export,
         strict_mode,

rust_port/crates/flow_cli/src/ls_command.rs

@@ -335,6 +335,7 @@ fn main_impl(args: &command_spec::Values) {
         root.clone(),
         std::env::var("FLOW_TEMP_DIR").unwrap_or_else(|_| "/tmp/flow".to_owned()),
         true, // no_flowlib for ls command
+        crate::command_utils::MakeOptionsOverrides::default(),
     );
     let options = Arc::new(options);
 

rust_port/crates/flow_cli/src/main.rs

@@ -88,6 +88,7 @@ pub(crate) fn get_options(cli_no_flowlib: bool, ignore_version: bool) -> Arc<Opt
         ignore_version,
         Path::new("."),
         ".flowconfig",
+        command_utils::MakeOptionsOverrides::default(),
     )
 }
 
@@ -96,6 +97,7 @@ pub(crate) fn get_options_with_root_and_flowconfig_name(
     ignore_version: bool,
     root: &Path,
     flowconfig_name: &str,
+    overrides: command_utils::MakeOptionsOverrides,
 ) -> Arc<Options> {
     let flowconfig_path = root.join(flowconfig_name);
     let flowconfig_path_str = flowconfig_path.to_string_lossy();
@@ -132,6 +134,7 @@ pub(crate) fn get_options_with_root_and_flowconfig_name(
         root,
         std::env::var("FLOW_TEMP_DIR").unwrap_or_else(|_| "/tmp/flow".to_owned()),
         cli_no_flowlib,
+        overrides,
     );
     Arc::new(options)
 }