mirror of
https://github.com/ilyakooo0/helix.git
synced 2024-12-01 11:23:10 +03:00
Separate colors for different diagnostics types (#2437)
* feat(theme): add separate diagnostic colors This commit adds separate diagnostic highlight colors for the different types of LSP severities. If the severity type doesn't exist or is unknown, we use some fallback coloring which was in use before this commit. Some initial color options were also added in the theme.toml Resolves issue #2157 * feat(theme): add docs for new diagnostic options * feat(theme): adjust defaults & reduce redundancy - the different colors for different diagnostic severities are now disabled in the default theme, instead diagnostics are just generally underlined (as prior to the changes of this feature) - the theme querying is now done once instead of every iteration in the loop of processing every diagnostic message
This commit is contained in:
parent
09f9f70576
commit
776686ab24
@ -234,6 +234,10 @@ These scopes are used for theming the editor interface.
|
||||
| `error` | Diagnostics error (gutter) |
|
||||
| `info` | Diagnostics info (gutter) |
|
||||
| `hint` | Diagnostics hint (gutter) |
|
||||
| `diagnostic` | For text in editing area |
|
||||
| `diagnostic` | Diagnostics fallback style (editing area) |
|
||||
| `diagnostic.hint` | Diagnostics hint (editing area) |
|
||||
| `diagnostic.info` | Diagnostics info (editing area) |
|
||||
| `diagnostic.warning` | Diagnostics warning (editing area) |
|
||||
| `diagnostic.error` | Diagnostics error (editing area) |
|
||||
|
||||
[rulers-config]: ./configuration.md#editor-section
|
||||
|
@ -247,17 +247,36 @@ impl EditorView {
|
||||
doc: &Document,
|
||||
theme: &Theme,
|
||||
) -> Vec<(usize, std::ops::Range<usize>)> {
|
||||
let diagnostic_scope = theme
|
||||
.find_scope_index("diagnostic")
|
||||
use helix_core::diagnostic::Severity;
|
||||
let get_scope_of = |scope| {
|
||||
theme
|
||||
.find_scope_index(scope)
|
||||
// get one of the themes below as fallback values
|
||||
.or_else(|| theme.find_scope_index("diagnostic"))
|
||||
.or_else(|| theme.find_scope_index("ui.cursor"))
|
||||
.or_else(|| theme.find_scope_index("ui.selection"))
|
||||
.expect(
|
||||
"at least one of the following scopes must be defined in the theme: `diagnostic`, `ui.cursor`, or `ui.selection`",
|
||||
);
|
||||
)
|
||||
};
|
||||
|
||||
// basically just queries the theme color defined in the config
|
||||
let hint = get_scope_of("diagnostic.hint");
|
||||
let info = get_scope_of("diagnostic.info");
|
||||
let warning = get_scope_of("diagnostic.warning");
|
||||
let error = get_scope_of("diagnostic.error");
|
||||
let r#default = get_scope_of("diagnostic"); // this is a bit redundant but should be fine
|
||||
|
||||
doc.diagnostics()
|
||||
.iter()
|
||||
.map(|diagnostic| {
|
||||
let diagnostic_scope = match diagnostic.severity {
|
||||
Some(Severity::Info) => info,
|
||||
Some(Severity::Hint) => hint,
|
||||
Some(Severity::Warning) => warning,
|
||||
Some(Severity::Error) => error,
|
||||
_ => r#default,
|
||||
};
|
||||
(
|
||||
diagnostic_scope,
|
||||
diagnostic.range.start..diagnostic.range.end,
|
||||
|
@ -67,6 +67,10 @@ label = "honey"
|
||||
"ui.menu.selected" = { fg = "revolver", bg = "white" }
|
||||
|
||||
diagnostic = { modifiers = ["underlined"] }
|
||||
# "diagnostic.hint" = { fg = "revolver", bg = "lilac" }
|
||||
# "diagnostic.info" = { fg = "revolver", bg = "lavender" }
|
||||
# "diagnostic.warning" = { fg = "revolver", bg = "honey" }
|
||||
# "diagnostic.error" = { fg = "revolver", bg = "apricot" }
|
||||
|
||||
warning = "lightning"
|
||||
error = "apricot"
|
||||
|
Loading…
Reference in New Issue
Block a user