Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Link rustc error codes in diagnostics

Browse source
This commit is contained in:
Lukas Wirth 2020-11-17 21:26:37 +01:00
parent 99975d08f0
commit 132063ad96
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/rust-analyzer/src/diagnostics/to_proto.rs
View file

@ -2,7 +2,7 @@
//! `cargo check` json format to the LSP diagnostic format. //! `cargo check` json format to the LSP diagnostic format.
use std::{collections::HashMap, path::Path}; use std::{collections::HashMap, path::Path};
use flycheck::{Applicability, DiagnosticLevel, DiagnosticSpan}; use flycheck::{Applicability, DiagnosticCode, DiagnosticLevel, DiagnosticSpan};
use stdx::format_to; use stdx::format_to;
use crate::{lsp_ext, to_proto::url_from_abs_path}; use crate::{lsp_ext, to_proto::url_from_abs_path};
@ -211,6 +211,8 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
} }
} }
let code_description = rustc_code_description(rd.code.as_ref());
primary_spans primary_spans
.iter() .iter()
.map(|primary_span| { .map(|primary_span| {
@ -248,7 +250,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
range: in_macro_location.range, range: in_macro_location.range,
severity, severity,
code: code.clone().map(lsp_types::NumberOrString::String), code: code.clone().map(lsp_types::NumberOrString::String),
code_description: None, code_description: code_description.clone(),
source: Some(source.clone()), source: Some(source.clone()),
message: message.clone(), message: message.clone(),
related_information: Some(information_for_additional_diagnostic), related_information: Some(information_for_additional_diagnostic),
@ -269,7 +271,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
range: location.range, range: location.range,
severity, severity,
code: code.clone().map(lsp_types::NumberOrString::String), code: code.clone().map(lsp_types::NumberOrString::String),
code_description: None, code_description: code_description.clone(),
source: Some(source.clone()), source: Some(source.clone()),
message, message,
related_information: if related_information.is_empty() { related_information: if related_information.is_empty() {
@ -292,6 +294,20 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
.collect() .collect()
} }
fn rustc_code_description(code: Option<&DiagnosticCode>) -> Option<lsp_types::CodeDescription> {
code.filter(|c| {
let mut chars = c.code.chars();
chars.next().map_or(false, |c| c == 'E')
&& chars.by_ref().take(4).all(|c| c.is_ascii_digit())
&& chars.next().is_none()
})
.and_then(|c| {
lsp_types::Url::parse(&format!("https://doc.rust-lang.org/error-index.html#{}", c.code))
.ok()
.map(|href| lsp_types::CodeDescription { href })
})
}
#[cfg(test)] #[cfg(test)]
#[cfg(not(windows))] #[cfg(not(windows))]
mod tests { mod tests {