h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 10:01:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

highlight: derive Display trait for HighlightRole

Browse Source 
Closes #12645
This commit is contained in:
xtqqczze
2026-04-18 13:45:08 +01:00
committed by Johannes Altmanninger
parent 4b172fc735
commit 68472da48a
3 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/highlight/highlight.rs
View File

@@ -34,6 +34,7 @@
WString, wstr,
};
use std::collections::{HashMap, hash_map::Entry};
use strum_macros::Display;
use super::file_tester::IsFile;
@@ -1257,7 +1258,7 @@ fn get_fallback(role: HighlightRole) -> HighlightRole {
}
/// Describes the role of a span of text.
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq, Display)]
#[repr(u8)]
pub enum HighlightRole {
#[default]
@@ -1294,47 +1295,6 @@ pub enum HighlightRole {
pager_selected_description,
}
impl From<HighlightRole> for &'static str {
fn from(value: HighlightRole) -> Self {
match value {
HighlightRole::normal => "normal",
HighlightRole::error => "error",
HighlightRole::command => "command",
HighlightRole::keyword => "keyword",
HighlightRole::statement_terminator => "statement_terminator",
HighlightRole::param => "param",
HighlightRole::option => "option",
HighlightRole::comment => "comment",
HighlightRole::search_match => "search_match",
HighlightRole::operat => "operat",
HighlightRole::escape => "escape",
HighlightRole::quote => "quote",
HighlightRole::redirection => "redirection",
HighlightRole::autosuggestion => "autosuggestion",
HighlightRole::selection => "selection",
HighlightRole::pager_progress => "pager_progress",
HighlightRole::pager_background => "pager_background",
HighlightRole::pager_prefix => "pager_prefix",
HighlightRole::pager_completion => "pager_completion",
HighlightRole::pager_description => "pager_description",
HighlightRole::pager_secondary_background => "pager_secondary_background",
HighlightRole::pager_secondary_prefix => "pager_secondary_prefix",
HighlightRole::pager_secondary_completion => "pager_secondary_completion",
HighlightRole::pager_secondary_description => "pager_secondary_description",
HighlightRole::pager_selected_background => "pager_selected_background",
HighlightRole::pager_selected_prefix => "pager_selected_prefix",
HighlightRole::pager_selected_completion => "pager_selected_completion",
HighlightRole::pager_selected_description => "pager_selected_description",
}
}
}
impl std::fmt::Display for HighlightRole {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
<&'static str>::from(*self).fmt(f)
}
}
/// Simple value type describing how a character should be highlighted.
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
pub struct HighlightSpec {