diff options
Diffstat (limited to 'cli/lsp/resolver.rs')
| -rw-r--r-- | cli/lsp/resolver.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs index dec46566f..d279031e3 100644 --- a/cli/lsp/resolver.rs +++ b/cli/lsp/resolver.rs @@ -4,7 +4,6 @@ use crate::args::create_default_npmrc; use crate::args::CacheSetting; use crate::args::CliLockfile; use crate::args::PackageJsonInstallDepsProvider; -use crate::args::DENO_FUTURE; use crate::graph_util::CliJsrUrlProvider; use crate::http_util::HttpClientProvider; use crate::lsp::config::Config; @@ -421,9 +420,14 @@ impl LspResolver { }; self .by_scope - .iter() - .rfind(|(s, _)| file_referrer.as_str().starts_with(s.as_str())) - .map(|(_, r)| r.as_ref()) + .values() + .rfind(|r| { + r.config_data + .as_ref() + .map(|d| d.scope_contains_specifier(file_referrer)) + .unwrap_or(false) + }) + .map(|r| r.as_ref()) .unwrap_or(self.unscoped.as_ref()) } } @@ -433,7 +437,7 @@ async fn create_npm_resolver( cache: &LspCache, http_client_provider: &Arc<HttpClientProvider>, ) -> Option<Arc<dyn CliNpmResolver>> { - let enable_byonm = config_data.map(|d| d.byonm).unwrap_or(*DENO_FUTURE); + let enable_byonm = config_data.map(|d| d.byonm).unwrap_or(false); let options = if enable_byonm { CliNpmResolverCreateOptions::Byonm(CliNpmResolverByonmCreateOptions { fs: Arc::new(deno_fs::RealFs), |