From 2b35cb3f2f3dee7bad2ddeff3b546020c6dfe18e Mon Sep 17 00:00:00 2001 From: Tomofumi Chiba Date: Mon, 17 Oct 2022 08:01:10 +0900 Subject: fix(lsp): treat empty import map value config as none (#16224) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref: denoland/vscode_deno#718 Co-authored-by: Bartek Iwańczuk --- cli/lsp/language_server.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cli') 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: \"{}\"", -- cgit v1.2.3