mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: support ANSI themes

Browse source
This commit is contained in:
Sam Mohr 2023-12-28 00:34:19 -08:00
parent 2d3512e965
commit 0a27d6e180
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
yazi-plugin/src/external/highlighter.rs vendored
View file

@ -1,7 +1,8 @@
use std::{mem, path::{Path, PathBuf}, sync::{atomic::{AtomicUsize, Ordering}, OnceLock}}; use std::{mem, path::{Path, PathBuf}, sync::{atomic::{AtomicUsize, Ordering}, OnceLock}};
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use syntect::{dumps::from_uncompressed_data, easy::HighlightLines, highlighting::{Theme, ThemeSet}, parsing::{SyntaxReference, SyntaxSet}, util::as_24_bit_terminal_escaped}; use crossterm::{style::{Color, Print, SetForegroundColor}, Command};
use syntect::{dumps::from_uncompressed_data, easy::HighlightLines, highlighting::{Style, Theme, ThemeSet}, parsing::{SyntaxReference, SyntaxSet}};
use tokio::{fs::File, io::{AsyncBufReadExt, BufReader}}; use tokio::{fs::File, io::{AsyncBufReadExt, BufReader}};
use yazi_config::THEME; use yazi_config::THEME;
use yazi_shared::PeekError; use yazi_shared::PeekError;
@ -117,15 +118,35 @@ impl Highlighter {
} }
let regions = h.highlight_line(&line, syntaxes).map_err(|e| anyhow!(e))?; let regions = h.highlight_line(&line, syntaxes).map_err(|e| anyhow!(e))?;
result.push_str(&as_24_bit_terminal_escaped(&regions, false)); Self::write_highlighted_line_as_ansi(&regions, &mut result)
.map_err(|e| anyhow!("Failed to write highlighted text to preview window: {}", e))?;
} }
result.push_str("\x1b[0m"); SetForegroundColor(Color::Reset)
.write_ansi(&mut result)
.map_err(|e| anyhow!("Failed to reset color at end of preview window line: {}", e))?;
Ok(result) Ok(result)
}) })
.await? .await?
} }
fn write_highlighted_line_as_ansi(regions: &[(Style, &str)], s: &mut String) -> std::fmt::Result {
for &(ref style, text) in regions {
let fg = style.foreground;
// As is done in the file previewer `bat`, we assume the convention that themes
// with a 0x00 alpha value are actually 8-bit themes, with their colors in the
// red color component. <https://github.com/sharkdp/bat/blob/b89dc15be1d86869bf73e5b9f96af7b930753a55/src/terminal.rs#L8>
let foreground_color =
if fg.a == 0 { Color::AnsiValue(fg.r) } else { Color::Rgb { r: fg.r, g: fg.g, b: fg.b } };
SetForegroundColor(foreground_color).write_ansi(s)?;
Print(text).write_ansi(s)?;
}
Ok(())
}
#[inline] #[inline]
pub fn abort() { INCR.fetch_add(1, Ordering::Relaxed); } pub fn abort() { INCR.fetch_add(1, Ordering::Relaxed); }
} }