From 6567dc94a901aaae1b4e5b8e84d48bc72d46ee2e Mon Sep 17 00:00:00 2001 From: David Sherret Date: Sat, 24 Feb 2024 00:21:09 -0500 Subject: fix(lsp): import map expansion (#22553) --- cli/tools/vendor/mod.rs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'cli/tools/vendor') diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs index f168f84a2..975cf08f1 100644 --- a/cli/tools/vendor/mod.rs +++ b/cli/tools/vendor/mod.rs @@ -173,9 +173,24 @@ fn validate_options( options: &mut CliOptions, output_dir: &Path, ) -> Result<(), AnyError> { + let import_map_specifier = options + .resolve_specified_import_map_specifier()? + .or_else(|| { + let config_file = options.maybe_config_file().as_ref()?; + config_file + .to_import_map_specifier() + .ok() + .flatten() + .or_else(|| { + if config_file.is_an_import_map() { + Some(config_file.specifier.clone()) + } else { + None + } + }) + }); // check the import map - if let Some(import_map_path) = options - .resolve_import_map_specifier()? + if let Some(import_map_path) = import_map_specifier .and_then(|p| specifier_to_file_path(&p).ok()) .and_then(|p| canonicalize_path(&p).ok()) { -- cgit v1.2.3