refactor(cli): consolidate most MainWorker related code to the same p…

…lace (denoland#15459)

cli/args/mod.rs

@@ -335,6 +335,20 @@ impl CliOptions {
  &self.flags.subcommand
  }
 
+ pub fn trace_ops(&self) -> bool {
+ match self.sub_command() {
+ DenoSubcommand::Test(flags) => flags.trace_ops,
+ _ => false,
+ }
+ }
+
+ pub fn shuffle_tests(&self) -> Option<u64> {
+ match self.sub_command() {
+ DenoSubcommand::Test(flags) => flags.shuffle,
+ _ => None,
+ }
+ }
+
  pub fn type_check_mode(&self) -> TypeCheckMode {
  self.flags.type_check_mode
  }

cli/lsp/testing/execution.rs

@@ -8,7 +8,6 @@ use crate::args::flags_from_vec;
 use crate::args::DenoSubcommand;
 use crate::checksum;
 use crate::create_main_worker;
-use crate::located_script_name;
 use crate::lsp::client::Client;
 use crate::lsp::client::TestingNotification;
 use crate::lsp::config;
@@ -166,39 +165,7 @@ async fn test_specifier(
  stderr: StdioPipe::File(sender.stderr()),
  },
  );
-
- worker.js_runtime.execute_script(
- &located_script_name!(),
- r#"Deno[Deno.internal].enableTestAndBench()"#,
- )?;
-
- worker
- .execute_script(
- &located_script_name!(),
- "Deno.core.enableOpCallTracing();",
- )
- .unwrap();
-
- if mode != test::TestMode::Documentation {
- worker.execute_side_module(&specifier).await?;
- }
-
- worker.dispatch_load_event(&located_script_name!())?;
-
- let test_result = worker.js_runtime.execute_script(
- &located_script_name!(),
- r#"Deno[Deno.internal].runTests()"#,
- )?;
-
- worker.js_runtime.resolve_value(test_result).await?;
-
- loop {
- if !worker.dispatch_beforeunload_event(&located_script_name!())? {
- break;
- }
- worker.run_event_loop(false).await?;
- }
- worker.dispatch_unload_event(&located_script_name!())?;
+ worker.run_lsp_test_specifier(mode).await?;
  }
 
  Ok(())