diff options
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/client.rs | 7 | ||||
| -rw-r--r-- | cli/lsp/diagnostics.rs | 14 | ||||
| -rw-r--r-- | cli/lsp/language_server.rs | 3 | ||||
| -rw-r--r-- | cli/lsp/parent_process_checker.rs | 3 | ||||
| -rw-r--r-- | cli/lsp/testing/execution.rs | 14 |
5 files changed, 24 insertions, 17 deletions
diff --git a/cli/lsp/client.rs b/cli/lsp/client.rs index d24d4c2a9..4923a4585 100644 --- a/cli/lsp/client.rs +++ b/cli/lsp/client.rs @@ -8,6 +8,7 @@ use deno_core::anyhow::bail; use deno_core::error::AnyError; use deno_core::serde_json; use deno_core::serde_json::Value; +use deno_core::task::spawn; use tower_lsp::lsp_types as lsp; use tower_lsp::lsp_types::ConfigurationItem; @@ -56,7 +57,7 @@ impl Client { ) { // do on a task in case the caller currently is in the lsp lock let client = self.0.clone(); - tokio::task::spawn(async move { + spawn(async move { client.send_registry_state_notification(params).await; }); } @@ -64,7 +65,7 @@ impl Client { pub fn send_test_notification(&self, params: TestingNotification) { // do on a task in case the caller currently is in the lsp lock let client = self.0.clone(); - tokio::task::spawn(async move { + spawn(async move { client.send_test_notification(params).await; }); } @@ -77,7 +78,7 @@ impl Client { // do on a task in case the caller currently is in the lsp lock let client = self.0.clone(); let message = message.to_string(); - tokio::task::spawn(async move { + spawn(async move { client.show_message(message_type, message).await; }); } diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index 0f96a498b..7b5a30a0e 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -25,6 +25,8 @@ use deno_core::resolve_url; use deno_core::serde::Deserialize; use deno_core::serde_json; use deno_core::serde_json::json; +use deno_core::task::spawn; +use deno_core::task::JoinHandle; use deno_core::ModuleSpecifier; use deno_graph::Resolution; use deno_graph::ResolutionError; @@ -197,9 +199,9 @@ impl DiagnosticsServer { runtime.block_on(async { let mut token = CancellationToken::new(); - let mut ts_handle: Option<tokio::task::JoinHandle<()>> = None; - let mut lint_handle: Option<tokio::task::JoinHandle<()>> = None; - let mut deps_handle: Option<tokio::task::JoinHandle<()>> = None; + let mut ts_handle: Option<JoinHandle<()>> = None; + let mut lint_handle: Option<JoinHandle<()>> = None; + let mut deps_handle: Option<JoinHandle<()>> = None; let diagnostics_publisher = DiagnosticsPublisher::new(client.clone()); loop { @@ -213,7 +215,7 @@ impl DiagnosticsServer { diagnostics_publisher.clear().await; let previous_ts_handle = ts_handle.take(); - ts_handle = Some(tokio::spawn({ + ts_handle = Some(spawn({ let performance = performance.clone(); let diagnostics_publisher = diagnostics_publisher.clone(); let ts_server = ts_server.clone(); @@ -265,7 +267,7 @@ impl DiagnosticsServer { })); let previous_deps_handle = deps_handle.take(); - deps_handle = Some(tokio::spawn({ + deps_handle = Some(spawn({ let performance = performance.clone(); let diagnostics_publisher = diagnostics_publisher.clone(); let token = token.clone(); @@ -293,7 +295,7 @@ impl DiagnosticsServer { })); let previous_lint_handle = lint_handle.take(); - lint_handle = Some(tokio::spawn({ + lint_handle = Some(spawn({ let performance = performance.clone(); let diagnostics_publisher = diagnostics_publisher.clone(); let token = token.clone(); diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index de5cd6f09..e76ea0040 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -8,6 +8,7 @@ use deno_core::resolve_url; use deno_core::serde_json; use deno_core::serde_json::json; use deno_core::serde_json::Value; +use deno_core::task::spawn; use deno_core::ModuleSpecifier; use deno_runtime::deno_fs; use deno_runtime::deno_node::NodeResolver; @@ -240,7 +241,7 @@ impl LanguageServer { let cli_options = result.cli_options; let roots = result.roots; let open_docs = result.open_docs; - let handle = tokio::task::spawn_local(async move { + let handle = spawn(async move { create_graph_for_caching(cli_options, roots, open_docs).await }); if let Err(err) = handle.await.unwrap() { diff --git a/cli/lsp/parent_process_checker.rs b/cli/lsp/parent_process_checker.rs index 4cc3bcef3..f83543c04 100644 --- a/cli/lsp/parent_process_checker.rs +++ b/cli/lsp/parent_process_checker.rs @@ -1,5 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. +use deno_core::task::spawn; use tokio::time::sleep; use tokio::time::Duration; @@ -7,7 +8,7 @@ use tokio::time::Duration; /// provided process id. Once that process no longer exists /// it will terminate the current process. pub fn start(parent_process_id: u32) { - tokio::task::spawn(async move { + spawn(async move { loop { sleep(Duration::from_secs(30)).await; diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs index 4834cd0c9..ce8c8b5ac 100644 --- a/cli/lsp/testing/execution.rs +++ b/cli/lsp/testing/execution.rs @@ -24,9 +24,11 @@ use deno_core::futures::stream; use deno_core::futures::StreamExt; use deno_core::parking_lot::Mutex; use deno_core::parking_lot::RwLock; +use deno_core::task::spawn; +use deno_core::task::spawn_blocking; use deno_core::ModuleSpecifier; use deno_runtime::permissions::Permissions; -use deno_runtime::tokio_util::run_local; +use deno_runtime::tokio_util::create_and_run_current_thread; use indexmap::IndexMap; use std::collections::HashMap; use std::collections::HashSet; @@ -284,7 +286,7 @@ impl TestRun { }; let token = self.token.clone(); - tokio::task::spawn_blocking(move || { + spawn_blocking(move || { if fail_fast_tracker.should_stop() { return Ok(()); } @@ -292,13 +294,13 @@ impl TestRun { let file_result = if token.is_cancelled() { Ok(()) } else { - run_local(test::test_specifier( - &worker_factory, + create_and_run_current_thread(test::test_specifier( + worker_factory, permissions, specifier, sender.clone(), fail_fast_tracker, - &test::TestSpecifierOptions { + test::TestSpecifierOptions { filter, shuffle: None, trace_ops: false, @@ -331,7 +333,7 @@ impl TestRun { )); let handler = { - tokio::task::spawn(async move { + spawn(async move { let earlier = Instant::now(); let mut summary = test::TestSummary::new(); let mut used_only = false; |