h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-02 05:41:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

highlight: implement Display trait for HighlightRole

Browse Source
This commit is contained in:
xtqqczze
2026-04-17 22:50:22 +01:00
committed by Peter Ammon
parent 5eb7687a64
commit 0cd227533f
2 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/builtins/fish_indent.rs
View File

@@ -1206,39 +1206,6 @@ fn read_file(mut f: impl Read) -> Result<WString, ()> {
Ok(bytes2wcstring(&buf))
}
fn highlight_role_to_string(role: HighlightRole) -> &'static wstr {
match role {
HighlightRole::normal => L!("normal"),
HighlightRole::error => L!("error"),
HighlightRole::command => L!("command"),
HighlightRole::keyword => L!("keyword"),
HighlightRole::statement_terminator => L!("statement_terminator"),
HighlightRole::param => L!("param"),
HighlightRole::option => L!("option"),
HighlightRole::comment => L!("comment"),
HighlightRole::search_match => L!("search_match"),
HighlightRole::operat => L!("operat"),
HighlightRole::escape => L!("escape"),
HighlightRole::quote => L!("quote"),
HighlightRole::redirection => L!("redirection"),
HighlightRole::autosuggestion => L!("autosuggestion"),
HighlightRole::selection => L!("selection"),
HighlightRole::pager_progress => L!("pager_progress"),
HighlightRole::pager_background => L!("pager_background"),
HighlightRole::pager_prefix => L!("pager_prefix"),
HighlightRole::pager_completion => L!("pager_completion"),
HighlightRole::pager_description => L!("pager_description"),
HighlightRole::pager_secondary_background => L!("pager_secondary_background"),
HighlightRole::pager_secondary_prefix => L!("pager_secondary_prefix"),
HighlightRole::pager_secondary_completion => L!("pager_secondary_completion"),
HighlightRole::pager_secondary_description => L!("pager_secondary_description"),
HighlightRole::pager_selected_background => L!("pager_selected_background"),
HighlightRole::pager_selected_prefix => L!("pager_selected_prefix"),
HighlightRole::pager_selected_completion => L!("pager_selected_completion"),
HighlightRole::pager_selected_description => L!("pager_selected_description"),
}
}
// Entry point for Pygments CSV output.
// Our output is a newline-separated string.
// Each line is of the form `start,end,role`
@@ -1281,14 +1248,7 @@ struct TokenRange {
// Now render these to a string.
let mut result = String::with_capacity(token_ranges.len() * 32);
for range in token_ranges {
writeln!(
result,
"{},{},{}",
range.start,
range.end,
highlight_role_to_string(range.role)
)
.unwrap();
writeln!(result, "{},{},{}", range.start, range.end, range.role).unwrap();
}
result.into_bytes()
}

41
src/highlight/highlight.rs
View File

@@ -1301,6 +1301,47 @@ 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 {