summaryrefslogtreecommitdiff
path: root/cli/lsp/language_server.rs
diff options
context:
space:
mode:
authorTomofumi Chiba <tomofumi.chiba@gmail.com>2022-10-17 08:01:10 +0900
committerGitHub <noreply@github.com>2022-10-17 10:01:10 +1100
commit2b35cb3f2f3dee7bad2ddeff3b546020c6dfe18e (patch)
tree7fd315d98eabc65694a4c3f524cf7f15ba9b783d /cli/lsp/language_server.rs
parentd2c8b5f0875c6c5ee7d99d2b2f487adf01a3b903 (diff)
fix(lsp): treat empty import map value config as none (#16224)
Ref: denoland/vscode_deno#718 Co-authored-by: Bartek IwaƄczuk <biwanczuk@gmail.com>
Diffstat (limited to 'cli/lsp/language_server.rs')
-rw-r--r--cli/lsp/language_server.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index c4617df9f..9141f7288 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -500,8 +500,12 @@ impl Inner {
pub async fn update_import_map(&mut self) -> Result<(), AnyError> {
let mark = self.performance.mark("update_import_map", None::<()>);
- let maybe_import_map_url = if let Some(import_map_str) =
- self.config.get_workspace_settings().import_map
+
+ let maybe_import_map_url = if let Some(import_map_str) = self
+ .config
+ .get_workspace_settings()
+ .import_map
+ .and_then(|s| if s.is_empty() { None } else { Some(s) })
{
lsp_log!(
"Setting import map from workspace settings: \"{}\"",