diff options
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/diagnostics.rs | 21 | ||||
| -rw-r--r-- | cli/lsp/documents.rs | 91 |
2 files changed, 99 insertions, 13 deletions
diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs index cb368b1f2..37427d878 100644 --- a/cli/lsp/diagnostics.rs +++ b/cli/lsp/diagnostics.rs @@ -970,6 +970,8 @@ pub enum DenoDiagnostic { ResolutionError(deno_graph::ResolutionError), /// Invalid `node:` specifier. InvalidNodeSpecifier(ModuleSpecifier), + /// Bare specifier is used for `node:` specifier + BareNodeSpecifier(String), } impl DenoDiagnostic { @@ -1003,6 +1005,7 @@ impl DenoDiagnostic { } } Self::InvalidNodeSpecifier(_) => "resolver-error", + Self::BareNodeSpecifier(_) => "import-node-prefix-missing", } } @@ -1174,6 +1177,7 @@ impl DenoDiagnostic { .map(|specifier| json!({ "specifier": specifier })) ), Self::InvalidNodeSpecifier(specifier) => (lsp::DiagnosticSeverity::ERROR, format!("Unknown Node built-in module: {}", specifier.path()), None), + Self::BareNodeSpecifier(specifier) => (lsp::DiagnosticSeverity::WARNING, format!("\"{}\" is resolved to \"node:{}\". If you want to use a built-in Node module, add a \"node:\" prefix.", specifier, specifier), Some(json!({ "specifier": specifier }))), }; lsp::Diagnostic { range: *range, @@ -1189,6 +1193,7 @@ impl DenoDiagnostic { fn diagnose_resolution( snapshot: &language_server::StateSnapshot, + dependency_key: &str, resolution: &Resolution, is_dynamic: bool, maybe_assert_type: Option<&str>, @@ -1253,6 +1258,20 @@ fn diagnose_resolution( if !deno_node::is_builtin_node_module(module_name) { diagnostics .push(DenoDiagnostic::InvalidNodeSpecifier(specifier.clone())); + } else if module_name == dependency_key { + let mut is_mapped = false; + if let Some(import_map) = &snapshot.maybe_import_map { + if let Resolution::Ok(resolved) = &resolution { + if import_map.resolve(module_name, &resolved.specifier).is_ok() { + is_mapped = true; + } + } + } + // show diagnostics for bare node specifiers that aren't mapped by import map + if !is_mapped { + diagnostics + .push(DenoDiagnostic::BareNodeSpecifier(module_name.to_string())); + } } else if let Some(npm_resolver) = snapshot .npm .as_ref() @@ -1329,6 +1348,7 @@ fn diagnose_dependency( diagnostics.extend( diagnose_resolution( snapshot, + dependency_key, if dependency.maybe_code.is_none() { &dependency.maybe_type } else { @@ -1362,6 +1382,7 @@ fn diagnose_dependency( diagnostics.extend( diagnose_resolution( snapshot, + dependency_key, &dependency.maybe_type, dependency.is_dynamic, dependency.maybe_attribute_type.as_deref(), diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs index f97d6d618..674540281 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -365,6 +365,7 @@ impl Document { maybe_headers: Option<HashMap<String, String>>, text_info: SourceTextInfo, resolver: &dyn deno_graph::source::Resolver, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> Self { // we only ever do `Document::new` on on disk resources that are supposed to // be diagnosable, unlike `Document::open`, so it is safe to unconditionally @@ -374,6 +375,7 @@ impl Document { text_info.clone(), maybe_headers.as_ref(), resolver, + npm_resolver, ); let dependencies = Arc::new(DocumentDependencies::from_maybe_module(&maybe_module)); @@ -396,6 +398,7 @@ impl Document { fn maybe_with_new_resolver( &self, resolver: &dyn deno_graph::source::Resolver, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> Option<Self> { let parsed_source_result = match &self.0.maybe_parsed_source { Some(parsed_source_result) => parsed_source_result.clone(), @@ -406,6 +409,7 @@ impl Document { &parsed_source_result, self.0.maybe_headers.as_ref(), resolver, + npm_resolver, )); let dependencies = Arc::new(DocumentDependencies::from_maybe_module(&maybe_module)); @@ -433,6 +437,7 @@ impl Document { content: Arc<str>, cache: &Arc<dyn HttpCache>, resolver: &dyn deno_graph::source::Resolver, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> Self { let maybe_headers = language_id.as_headers(); let text_info = SourceTextInfo::new(content); @@ -442,6 +447,7 @@ impl Document { text_info.clone(), maybe_headers, resolver, + npm_resolver, ) } else { (None, None) @@ -470,6 +476,7 @@ impl Document { version: i32, changes: Vec<lsp::TextDocumentContentChangeEvent>, resolver: &dyn deno_graph::source::Resolver, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> Result<Document, AnyError> { let mut content = self.0.text_info.text_str().to_string(); let mut line_index = self.0.line_index.clone(); @@ -505,6 +512,7 @@ impl Document { text_info.clone(), maybe_headers, resolver, + npm_resolver, ) } else { (None, None) @@ -809,6 +817,7 @@ impl FileSystemDocuments { cache: &Arc<dyn HttpCache>, resolver: &dyn deno_graph::source::Resolver, specifier: &ModuleSpecifier, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> Option<Document> { let fs_version = if specifier.scheme() == "data" { Some("1".to_string()) @@ -818,7 +827,7 @@ impl FileSystemDocuments { let file_system_doc = self.docs.get(specifier); if file_system_doc.map(|d| d.fs_version().to_string()) != fs_version { // attempt to update the file on the file system - self.refresh_document(cache, resolver, specifier) + self.refresh_document(cache, resolver, specifier, npm_resolver) } else { file_system_doc.cloned() } @@ -831,6 +840,7 @@ impl FileSystemDocuments { cache: &Arc<dyn HttpCache>, resolver: &dyn deno_graph::source::Resolver, specifier: &ModuleSpecifier, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> Option<Document> { let doc = if specifier.scheme() == "file" { let path = specifier_to_file_path(specifier).ok()?; @@ -845,6 +855,7 @@ impl FileSystemDocuments { None, SourceTextInfo::from_string(content), resolver, + npm_resolver, ) } else if specifier.scheme() == "data" { let (source, _) = get_source_from_data_url(specifier).ok()?; @@ -854,6 +865,7 @@ impl FileSystemDocuments { None, SourceTextInfo::from_string(source), resolver, + npm_resolver, ) } else { let fs_version = calculate_fs_version(cache, specifier)?; @@ -870,6 +882,7 @@ impl FileSystemDocuments { maybe_headers, SourceTextInfo::from_string(content), resolver, + npm_resolver, ) }; self.dirty = true; @@ -948,6 +961,7 @@ impl Documents { maybe_jsx_import_source_config: None, maybe_import_map: None, maybe_vendor_dir: None, + bare_node_builtins_enabled: false, }, )), npm_specifier_reqs: Default::default(), @@ -976,6 +990,7 @@ impl Documents { content: Arc<str>, ) -> Document { let resolver = self.get_resolver(); + let npm_resolver = self.get_npm_resolver(); let document = Document::open( specifier.clone(), version, @@ -983,6 +998,7 @@ impl Documents { content, &self.cache, resolver, + npm_resolver, ); let mut file_system_docs = self.file_system_docs.lock(); file_system_docs.docs.remove(&specifier); @@ -1015,7 +1031,12 @@ impl Documents { )) })?; self.dirty = true; - let doc = doc.with_change(version, changes, self.get_resolver())?; + let doc = doc.with_change( + version, + changes, + self.get_resolver(), + self.get_npm_resolver(), + )?; self.open_docs.insert(doc.specifier().clone(), doc.clone()); Ok(doc) } @@ -1125,7 +1146,12 @@ impl Documents { Some(document.clone()) } else { let mut file_system_docs = self.file_system_docs.lock(); - file_system_docs.get(&self.cache, self.get_resolver(), &specifier) + file_system_docs.get( + &self.cache, + self.get_resolver(), + &specifier, + self.get_npm_resolver(), + ) } } @@ -1344,6 +1370,15 @@ impl Documents { .maybe_config_file .and_then(|c| c.vendor_dir_path()) .as_ref(), + bare_node_builtins_enabled: options + .maybe_config_file + .map(|config| { + config + .json + .unstable + .contains(&"bare-node-builtins".to_string()) + }) + .unwrap_or(false), }, )); self.imports = Arc::new( @@ -1353,8 +1388,12 @@ impl Documents { imports .into_iter() .map(|(referrer, imports)| { - let graph_import = - GraphImport::new(&referrer, imports, Some(self.get_resolver())); + let graph_import = GraphImport::new( + &referrer, + imports, + Some(self.get_resolver()), + Some(self.get_npm_resolver()), + ); (referrer, graph_import) }) .collect() @@ -1384,8 +1423,10 @@ impl Documents { document_preload_limit: usize, ) { let resolver = self.resolver.as_graph_resolver(); + let npm_resolver = self.resolver.as_graph_npm_resolver(); for doc in self.open_docs.values_mut() { - if let Some(new_doc) = doc.maybe_with_new_resolver(resolver) { + if let Some(new_doc) = doc.maybe_with_new_resolver(resolver, npm_resolver) + { *doc = new_doc; } } @@ -1411,11 +1452,18 @@ impl Documents { if !open_docs.contains_key(&specifier) && !fs_docs.docs.contains_key(&specifier) { - fs_docs.refresh_document(&self.cache, resolver, &specifier); + fs_docs.refresh_document( + &self.cache, + resolver, + &specifier, + npm_resolver, + ); } else { // update the existing entry to have the new resolver if let Some(doc) = fs_docs.docs.get_mut(&specifier) { - if let Some(new_doc) = doc.maybe_with_new_resolver(resolver) { + if let Some(new_doc) = + doc.maybe_with_new_resolver(resolver, npm_resolver) + { *doc = new_doc; } } @@ -1436,7 +1484,9 @@ impl Documents { // since we hit the limit, just update everything to use the new resolver for uri in not_found_docs { if let Some(doc) = fs_docs.docs.get_mut(&uri) { - if let Some(new_doc) = doc.maybe_with_new_resolver(resolver) { + if let Some(new_doc) = + doc.maybe_with_new_resolver(resolver, npm_resolver) + { *doc = new_doc; } } @@ -1455,7 +1505,9 @@ impl Documents { // just update to use the new resolver for doc in fs_docs.docs.values_mut() { - if let Some(new_doc) = doc.maybe_with_new_resolver(resolver) { + if let Some(new_doc) = + doc.maybe_with_new_resolver(resolver, npm_resolver) + { *doc = new_doc; } } @@ -1528,11 +1580,12 @@ impl Documents { } let resolver = self.get_resolver(); + let npm_resolver = self.get_npm_resolver(); while let Some(specifier) = doc_analyzer.pending_specifiers.pop_front() { if let Some(doc) = self.open_docs.get(&specifier) { doc_analyzer.analyze_doc(&specifier, doc); } else if let Some(doc) = - file_system_docs.get(&self.cache, resolver, &specifier) + file_system_docs.get(&self.cache, resolver, &specifier, npm_resolver) { doc_analyzer.analyze_doc(&specifier, &doc); } @@ -1563,6 +1616,10 @@ impl Documents { self.resolver.as_graph_resolver() } + fn get_npm_resolver(&self) -> &dyn deno_graph::source::NpmResolver { + self.resolver.as_graph_npm_resolver() + } + fn resolve_dependency( &self, specifier: &ModuleSpecifier, @@ -1698,10 +1755,16 @@ fn parse_and_analyze_module( text_info: SourceTextInfo, maybe_headers: Option<&HashMap<String, String>>, resolver: &dyn deno_graph::source::Resolver, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> (Option<ParsedSourceResult>, Option<ModuleResult>) { let parsed_source_result = parse_source(specifier, text_info, maybe_headers); - let module_result = - analyze_module(specifier, &parsed_source_result, maybe_headers, resolver); + let module_result = analyze_module( + specifier, + &parsed_source_result, + maybe_headers, + resolver, + npm_resolver, + ); (Some(parsed_source_result), Some(module_result)) } @@ -1725,6 +1788,7 @@ fn analyze_module( parsed_source_result: &ParsedSourceResult, maybe_headers: Option<&HashMap<String, String>>, resolver: &dyn deno_graph::source::Resolver, + npm_resolver: &dyn deno_graph::source::NpmResolver, ) -> ModuleResult { match parsed_source_result { Ok(parsed_source) => Ok(deno_graph::parse_module_from_ast( @@ -1732,6 +1796,7 @@ fn analyze_module( maybe_headers, parsed_source, Some(resolver), + Some(npm_resolver), )), Err(err) => Err(deno_graph::ModuleGraphError::ModuleError( deno_graph::ModuleError::ParseErr(specifier.clone(), err.clone()), |