Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Link clippy lint codes in diagnostics

Browse source
This commit is contained in:
Lukas Wirth 2020-11-17 21:56:37 +01:00
parent 132063ad96
commit 863fdcfa24
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
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, DiagnosticCode, DiagnosticLevel, DiagnosticSpan}; use flycheck::{Applicability, 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,7 +211,11 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
} }
} }
let code_description = rustc_code_description(rd.code.as_ref()); let code_description = match source.as_str() {
"rustc" => rustc_code_description(code.as_deref()),
"clippy" => clippy_code_description(code.as_deref()),
_ => None,
};
primary_spans primary_spans
.iter() .iter()
@ -294,15 +298,26 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
.collect() .collect()
} }
fn rustc_code_description(code: Option<&DiagnosticCode>) -> Option<lsp_types::CodeDescription> { fn rustc_code_description(code: Option<&str>) -> Option<lsp_types::CodeDescription> {
code.filter(|c| { code.filter(|code| {
let mut chars = c.code.chars(); let mut chars = code.chars();
chars.next().map_or(false, |c| c == 'E') chars.next().map_or(false, |c| c == 'E')
&& chars.by_ref().take(4).all(|c| c.is_ascii_digit()) && chars.by_ref().take(4).all(|c| c.is_ascii_digit())
&& chars.next().is_none() && chars.next().is_none()
}) })
.and_then(|c| { .and_then(|code| {
lsp_types::Url::parse(&format!("https://doc.rust-lang.org/error-index.html#{}", c.code)) lsp_types::Url::parse(&format!("https://doc.rust-lang.org/error-index.html#{}", code))
.ok()
.map(|href| lsp_types::CodeDescription { href })
})
}
fn clippy_code_description(code: Option<&str>) -> Option<lsp_types::CodeDescription> {
code.and_then(|code| {
lsp_types::Url::parse(&format!(
"https://rust-lang.github.io/rust-clippy/master/index.html#{}",
code
))
.ok() .ok()
.map(|href| lsp_types::CodeDescription { href }) .map(|href| lsp_types::CodeDescription { href })
}) })