diff options
author | Kitson Kelly <me@kitsonkelly.com> | 2022-08-10 07:27:22 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-10 07:27:22 +1000 |
commit | 1c2ec1f48f2cf9255f0a43f2ec3d15aeee081b33 (patch) | |
tree | ed4d58c05b5f4ed9b19a8e3ae5f840740c7e0988 /cli/lsp/documents.rs | |
parent | 1f54d877895ea25258a941818f07c6e84d44a7a2 (diff) |
fix: update deno_graph to fix importing config as JSON module (#15388)
Ref: denoland/deno_graph#166
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 4cc0beb2a..ca771e656 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -23,7 +23,7 @@ use deno_core::error::AnyError; use deno_core::parking_lot::Mutex; use deno_core::url; use deno_core::ModuleSpecifier; -use deno_graph::Module; +use deno_graph::GraphImport; use deno_graph::Resolved; use once_cell::sync::Lazy; use std::collections::BTreeMap; @@ -719,7 +719,7 @@ pub struct Documents { file_system_docs: Arc<Mutex<FileSystemDocuments>>, /// Any imports to the context supplied by configuration files. This is like /// the imports into the a module graph in CLI. - imports: Arc<HashMap<ModuleSpecifier, Module>>, + imports: Arc<HashMap<ModuleSpecifier, GraphImport>>, /// The optional import map that should be used when resolving dependencies. maybe_import_map: Option<ImportMapResolver>, /// The optional JSX resolver, which is used when JSX imports are configured. @@ -1035,12 +1035,12 @@ impl Documents { imports .into_iter() .map(|(referrer, dependencies)| { - let module = Module::new_from_type_imports( + let graph_import = GraphImport::new( referrer.clone(), dependencies, self.get_maybe_resolver(), ); - (referrer, module) + (referrer, graph_import) }) .collect() } else { @@ -1128,8 +1128,8 @@ impl Documents { &self, specifier: &str, ) -> Option<&deno_graph::Resolved> { - for module in self.imports.values() { - let maybe_dep = module.dependencies.get(specifier); + for graph_imports in self.imports.values() { + let maybe_dep = graph_imports.dependencies.get(specifier); if maybe_dep.is_some() { return maybe_dep.map(|d| &d.maybe_type); } |