diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-06-26 17:24:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 21:24:10 +0000 |
| commit | 0da01c0ca6b537f74be32126e567bdfc2c73ed16 (patch) | |
| tree | ef29d32cffb03a975a58c16827b0691dda50a5b3 /cli/lsp/resolver.rs | |
| parent | 86e0292733d6d08bf338b68fd50863aef17b1e44 (diff) | |
refactor: move PackageJson to deno_config (#24348)
Diffstat (limited to 'cli/lsp/resolver.rs')
| -rw-r--r-- | cli/lsp/resolver.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs index c4c66f114..45d44032f 100644 --- a/cli/lsp/resolver.rs +++ b/cli/lsp/resolver.rs @@ -48,7 +48,6 @@ use std::collections::BTreeMap; use std::collections::BTreeSet; use std::collections::HashMap; use std::collections::HashSet; -use std::rc::Rc; use std::sync::Arc; use super::cache::LspCache; @@ -359,15 +358,12 @@ impl LspResolver { pub fn get_closest_package_json( &self, referrer: &ModuleSpecifier, - ) -> Result<Option<Rc<PackageJson>>, AnyError> { + ) -> Result<Option<Arc<PackageJson>>, AnyError> { let resolver = self.get_scope_resolver(Some(referrer)); let Some(node_resolver) = resolver.node_resolver.as_ref() else { return Ok(None); }; - node_resolver.get_closest_package_json( - referrer, - &mut deno_runtime::deno_node::AllowAllNodePermissions, - ) + node_resolver.get_closest_package_json(referrer) } pub fn resolve_redirects( @@ -462,7 +458,7 @@ async fn create_npm_resolver( config_data .and_then(|d| d.package_json.as_ref()) .map(|package_json| { - package_json::get_local_package_json_version_reqs(package_json) + package_json.resolve_local_package_json_version_reqs() }), )), npmrc: config_data @@ -506,7 +502,7 @@ fn create_graph_resolver( config_data .and_then(|d| d.package_json.as_ref()) .map(|package_json| { - package_json::get_local_package_json_version_reqs(package_json) + package_json.resolve_local_package_json_version_reqs() }), )), maybe_jsx_import_source_config: config_file |