mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 20:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

diagnostics: Use Vec<Tag> instead of Option<Vec<Tag>>

Browse source
This commit is contained in:
Blaž Hrastnik 2022-09-20 16:28:00 +09:00
parent 64b0745413
commit 1df32c917c
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helix-core/src/diagnostic.rs
View file

@ -43,6 +43,6 @@ pub struct Diagnostic {
pub message: String, pub message: String,
pub severity: Option<Severity>, pub severity: Option<Severity>,
pub code: Option<NumberOrString>, pub code: Option<NumberOrString>,
pub tags: Option<Vec<DiagnosticTag>>, pub tags: Vec<DiagnosticTag>,
pub source: Option<String>, pub source: Option<String>,
} }

23
helix-lsp/src/lib.rs
View file

@ -84,19 +84,18 @@ pub mod util {
None => None, None => None,
}; };
let tags = if let Some(ref tags) = diag.tags { let new_tags: Vec<_> = diag
let new_tags = tags .tags
.iter() .iter()
.map(|tag| match tag { .map(|tag| match tag {
helix_core::diagnostic::DiagnosticTag::Unnecessary => { helix_core::diagnostic::DiagnosticTag::Unnecessary => {
lsp::DiagnosticTag::UNNECESSARY lsp::DiagnosticTag::UNNECESSARY
} }
helix_core::diagnostic::DiagnosticTag::Deprecated => { helix_core::diagnostic::DiagnosticTag::Deprecated => lsp::DiagnosticTag::DEPRECATED,
lsp::DiagnosticTag::DEPRECATED })
} .collect();
})
.collect();
let tags = if !new_tags.is_empty() {
Some(new_tags) Some(new_tags)
} else { } else {
None None

4
helix-term/src/application.rs
View file

@ -614,9 +614,9 @@ impl Application {
} }
}).collect(); }).collect();
Some(new_tags) new_tags
} else { } else {
None Vec::new()
}; };
Some(Diagnostic { Some(Diagnostic {