diff options
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/capabilities.rs | 5 | ||||
| -rw-r--r-- | cli/lsp/language_server.rs | 9 | ||||
| -rw-r--r-- | cli/lsp/mod.rs | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/cli/lsp/capabilities.rs b/cli/lsp/capabilities.rs index 8b624eafc..c17a8360f 100644 --- a/cli/lsp/capabilities.rs +++ b/cli/lsp/capabilities.rs @@ -121,7 +121,10 @@ pub fn server_capabilities( color_provider: None, execute_command_provider: Some(ExecuteCommandOptions { commands: if enable_builtin_commands { - vec!["deno.cache".into()] + vec![ + "deno.cache".to_string(), + "deno.reloadImportRegistries".to_string(), + ] } else { vec![] }, diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 9e553b8b9..b19b00b4a 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -3035,7 +3035,7 @@ impl tower_lsp::LanguageServer for LanguageServer { let referrer = serde_json::to_value(arguments.next()).unwrap(); let referrer: Url = serde_json::from_value(referrer) .map_err(|err| LspError::invalid_params(err.to_string()))?; - return self + self .cache_request(Some( serde_json::to_value(lsp_custom::CacheParams { referrer: TextDocumentIdentifier { uri: referrer }, @@ -3046,9 +3046,12 @@ impl tower_lsp::LanguageServer for LanguageServer { }) .expect("well formed json"), )) - .await; + .await + } else if params.command == "deno.reloadImportRegistries" { + self.0.write().await.reload_import_registries().await + } else { + Ok(None) } - Ok(None) } async fn initialize( diff --git a/cli/lsp/mod.rs b/cli/lsp/mod.rs index 3ef19173b..c2f3eda71 100644 --- a/cli/lsp/mod.rs +++ b/cli/lsp/mod.rs @@ -49,6 +49,9 @@ pub async fn start() -> Result<(), AnyError> { lsp_custom::PERFORMANCE_REQUEST, LanguageServer::performance_request, ) + // TODO(nayeemrmn): The extension has replaced this with the + // `deno.reloadImportRegistries` command as of vscode_deno + // 3.26.0 / 2023.10.10. Remove this eventually. .custom_method( lsp_custom::RELOAD_IMPORT_REGISTRIES_REQUEST, LanguageServer::reload_import_registries_request, |