diff options
Diffstat (limited to 'cli/lsp/documents.rs')
-rw-r--r-- | cli/lsp/documents.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs index 8227d2e4c..11fba693f 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -43,8 +43,8 @@ use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::NodeResolver; use deno_runtime::deno_node::PackageJson; use deno_runtime::permissions::PermissionsContainer; -use deno_semver::npm::NpmPackageReq; use deno_semver::npm::NpmPackageReqReference; +use deno_semver::package::PackageReq; use indexmap::IndexMap; use lsp::Url; use once_cell::sync::Lazy; @@ -846,7 +846,7 @@ pub struct Documents { /// settings. resolver: Arc<CliGraphResolver>, /// The npm package requirements found in npm specifiers. - npm_specifier_reqs: Arc<Vec<NpmPackageReq>>, + npm_specifier_reqs: Arc<Vec<PackageReq>>, /// Gets if any document had a node: specifier such that a @types/node package /// should be injected. has_injected_types_node_package: bool, @@ -1017,7 +1017,7 @@ impl Documents { } /// Returns a collection of npm package requirements. - pub fn npm_package_reqs(&mut self) -> Arc<Vec<NpmPackageReq>> { + pub fn npm_package_reqs(&mut self) -> Arc<Vec<PackageReq>> { self.calculate_dependents_if_dirty(); self.npm_specifier_reqs.clone() } @@ -1398,7 +1398,7 @@ impl Documents { dependents_map: HashMap<ModuleSpecifier, HashSet<ModuleSpecifier>>, analyzed_specifiers: HashSet<ModuleSpecifier>, pending_specifiers: VecDeque<ModuleSpecifier>, - npm_reqs: HashSet<NpmPackageReq>, + npm_reqs: HashSet<PackageReq>, has_node_builtin_specifier: bool, } @@ -1410,7 +1410,7 @@ impl Documents { // been analyzed in order to not cause an extra file system lookup self.pending_specifiers.push_back(dep.clone()); if let Ok(reference) = NpmPackageReqReference::from_specifier(dep) { - self.npm_reqs.insert(reference.req); + self.npm_reqs.insert(reference.into_inner().req); } } @@ -1468,7 +1468,7 @@ impl Documents { .has_node_builtin_specifier && !npm_reqs.iter().any(|r| r.name == "@types/node"); if self.has_injected_types_node_package { - npm_reqs.insert(NpmPackageReq::from_str("@types/node").unwrap()); + npm_reqs.insert(PackageReq::from_str("@types/node").unwrap()); } self.dependents_map = Arc::new(doc_analyzer.dependents_map); |