diff options
author | Kitson Kelly <me@kitsonkelly.com> | 2021-05-12 13:10:06 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-12 13:10:06 +1000 |
commit | 0e17f086ce3795dc958e2bb8dad2bf3525d2b55f (patch) | |
tree | dbd61d6462d90c144f9666b061dc67a69e82a572 /cli/lsp/language_server.rs | |
parent | 57927781ed7eb8bb088d656768dc295716407c7a (diff) |
fix(#10603): revert minimal changes to resolve deadlock bug (#10605)
Diffstat (limited to 'cli/lsp/language_server.rs')
-rw-r--r-- | cli/lsp/language_server.rs | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 5ed6f693c..2f090938c 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -594,25 +594,26 @@ impl Inner { let specifier = self.url_map.normalize_url(¶ms.text_document.uri); // we only query the individual resource file if the client supports it - if self.config.client_capabilities.workspace_configuration - && !self.config.contains(&specifier) - { - if let Ok(value) = self - .client - .configuration(vec![ConfigurationItem { - scope_uri: Some(params.text_document.uri.clone()), - section: Some(SETTINGS_SECTION.to_string()), - }]) - .await - { - if let Err(err) = self - .config - .update_specifier(specifier.clone(), value[0].clone()) - { - warn!("Error updating specifier configuration: {}", err); - } - } - } + // TODO(@kitsonk) workaround https://github.com/denoland/deno/issues/10603 + // if self.config.client_capabilities.workspace_configuration + // && !self.config.contains(&specifier) + // { + // if let Ok(value) = self + // .client + // .configuration(vec![ConfigurationItem { + // scope_uri: Some(params.text_document.uri.clone()), + // section: Some(SETTINGS_SECTION.to_string()), + // }]) + // .await + // { + // if let Err(err) = self + // .config + // .update_specifier(specifier.clone(), value[0].clone()) + // { + // warn!("Error updating specifier configuration: {}", err); + // } + // } + // } if params.text_document.uri.scheme() == "deno" { // we can ignore virtual text documents opening, as they don't need to |