Skip to content

Commit ab37835

Browse files
committed
fix diagnostic severity
1 parent e3b555e commit ab37835

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

crates/emmylua_code_analysis/src/config/configs/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn default_true() -> bool {
5050
true
5151
}
5252

53-
#[derive(Serialize, Deserialize, Debug, JsonSchema)]
53+
#[derive(Serialize, Deserialize, Debug, JsonSchema, Clone, Copy)]
5454
#[serde(rename_all = "camelCase")]
5555
pub enum DiagnosticSeveritySetting {
5656
/// Represents an error diagnostic severity.

crates/emmylua_code_analysis/src/diagnostic/checker/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ impl<'a> DiagnosticContext<'a> {
126126
}
127127

128128
fn get_severity(&self, code: DiagnosticCode) -> Option<DiagnosticSeverity> {
129+
if let Some(severity) = self.config.severity.get(&code) {
130+
return Some(severity.clone());
131+
}
132+
129133
Some(get_default_severity(code))
130134
}
131135

crates/emmylua_code_analysis/src/diagnostic/lua_diagnostic_config.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
use std::collections::HashSet;
1+
use std::collections::{HashMap, HashSet};
22

3+
use lsp_types::DiagnosticSeverity;
34
use regex::Regex;
45
use smol_str::SmolStr;
56

@@ -13,6 +14,7 @@ pub struct LuaDiagnosticConfig {
1314
pub workspace_disabled: HashSet<DiagnosticCode>,
1415
pub global_disable_set: HashSet<SmolStr>,
1516
pub global_disable_glob: Vec<Regex>,
17+
pub severity: HashMap<DiagnosticCode, DiagnosticSeverity>
1618
}
1719

1820
impl LuaDiagnosticConfig {
@@ -39,11 +41,16 @@ impl LuaDiagnosticConfig {
3941
})
4042
.collect();
4143

44+
let mut severity = HashMap::new();
45+
for (code, sev) in &emmyrc.diagnostics.severity {
46+
severity.insert(code.clone(), sev.clone().into());
47+
}
4248
Self {
4349
workspace_disabled,
4450
workspace_enabled,
4551
global_disable_set,
4652
global_disable_glob,
53+
severity
4754
}
4855
}
4956
}

0 commit comments

Comments
 (0)