diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-07-17 14:00:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-17 14:00:44 -0400 |
commit | 7a9f7f34195d74fe60eb48381bc2a32db741ceb7 (patch) | |
tree | c10516eda55afebb75f98bbfecd1cc555891e3ce /cli/lsp/analysis.rs | |
parent | 37241e9b1e2d16cd160d529e69c6a782fff8a8b4 (diff) |
fix(node): improve require esm error messages (#19853)
Part of #19842.
Closes #19583
Closes #16913
Diffstat (limited to 'cli/lsp/analysis.rs')
-rw-r--r-- | cli/lsp/analysis.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index e5cd9d028..63e0549fd 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -198,7 +198,7 @@ impl<'a> TsResponseImportMapper<'a> { } if self.npm_resolver.in_npm_package(specifier) { - if let Ok(pkg_id) = self + if let Ok(Some(pkg_id)) = self .npm_resolver .resolve_package_id_from_specifier(specifier) { @@ -254,7 +254,8 @@ impl<'a> TsResponseImportMapper<'a> { let root_folder = self .npm_resolver .resolve_package_folder_from_specifier(specifier) - .ok()?; + .ok() + .flatten()?; let package_json_path = root_folder.join("package.json"); let package_json_text = std::fs::read_to_string(&package_json_path).ok()?; let package_json = |