diff options
Diffstat (limited to 'cli/tools/repl')
-rw-r--r-- | cli/tools/repl/mod.rs | 5 | ||||
-rw-r--r-- | cli/tools/repl/session.rs | 14 |
2 files changed, 7 insertions, 12 deletions
diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs index 698abb691..80ab2a2d2 100644 --- a/cli/tools/repl/mod.rs +++ b/cli/tools/repl/mod.rs @@ -172,9 +172,7 @@ pub async fn run(flags: Flags, repl_flags: ReplFlags) -> Result<i32, AnyError> { .create_custom_worker( main_module.clone(), permissions, - vec![crate::ops::testing::deno_test::init_ops( - test_event_sender.clone(), - )], + vec![crate::ops::testing::deno_test::init_ops(test_event_sender)], Default::default(), ) .await?; @@ -186,7 +184,6 @@ pub async fn run(flags: Flags, repl_flags: ReplFlags) -> Result<i32, AnyError> { resolver, worker, main_module, - test_event_sender, test_event_receiver, ) .await?; diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index e5f70df15..840d85822 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -12,10 +12,10 @@ use crate::tools::test::report_tests; use crate::tools::test::reporters::PrettyTestReporter; use crate::tools::test::reporters::TestReporter; use crate::tools::test::run_tests_for_worker; +use crate::tools::test::send_test_event; use crate::tools::test::worker_has_tests; use crate::tools::test::TestEvent; use crate::tools::test::TestEventReceiver; -use crate::tools::test::TestEventSender; use deno_ast::diagnostics::Diagnostic; use deno_ast::swc::ast as swc_ast; @@ -184,7 +184,6 @@ pub struct ReplSession { referrer: ModuleSpecifier, main_module: ModuleSpecifier, test_reporter_factory: Box<dyn Fn() -> Box<dyn TestReporter>>, - test_event_sender: TestEventSender, /// This is only optional because it's temporarily taken when evaluating. test_event_receiver: Option<TestEventReceiver>, jsx: ReplJsxState, @@ -198,7 +197,6 @@ impl ReplSession { resolver: Arc<CliGraphResolver>, mut worker: MainWorker, main_module: ModuleSpecifier, - test_event_sender: TestEventSender, test_event_receiver: TestEventReceiver, ) -> Result<Self, AnyError> { let language_server = ReplLanguageServer::new_initialized().await?; @@ -278,7 +276,6 @@ impl ReplSession { )) }), main_module, - test_event_sender, test_event_receiver: Some(test_event_receiver), jsx: ReplJsxState { factory: "React.createElement".to_string(), @@ -466,10 +463,11 @@ impl ReplSession { ) .await .unwrap(); - self - .test_event_sender - .send(TestEvent::ForceEndReport) - .unwrap(); + send_test_event( + &self.worker.js_runtime.op_state(), + TestEvent::ForceEndReport, + ) + .unwrap(); self.test_event_receiver = Some(report_tests_handle.await.unwrap().1); } |