utils-shell/lotabout.skim
1
0
Fork 0
mirror of https://github.com/lotabout/skim.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: use ansi-stripped raw item in preview expansion

Browse source
This commit is contained in:
Loric ANDRE 2026-01-20 09:48:06 +01:00
parent 3edc307768
commit 52bf6a247b
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/util.rs
View file

@ -1,6 +1,7 @@
use crate::SkimItem;
use crate::field::FieldRange;
use crate::field::get_string_by_field;
use crate::helper::item::strip_ansi;
use regex::Regex;
use std::fs::File;
use std::io::{BufRead, BufReader};
@ -103,10 +104,7 @@ pub fn printf(
query: &str,
command_query: &str,
) -> String {
let (item_text, field_text) = match current {
Some(ref s) => (s.text().into_owned(), s.output().into_owned()),
None => (String::default(), String::default()),
};
let item_text = current.as_ref().map(|s| strip_ansi(&s.output()).0).unwrap_or_default();
// Replace static fields first
let mut res = pattern.replace(replstr, &escape_arg(&item_text));
@ -141,7 +139,7 @@ pub fn printf(
if pattern.is_empty() {
replaced.push_str("{}");
} else if let Some(range) = FieldRange::from_str(&pattern) {
let replacement = get_string_by_field(delimiter, &field_text, &range).unwrap_or_default();
let replacement = get_string_by_field(delimiter, &item_text, &range).unwrap_or_default();
replaced.push_str(&escape_arg(replacement));
} else {
log::warn!("Failed to build field range from {pattern}");

2
tests/preview.rs
View file

@ -8,7 +8,7 @@ sk_test!(preview_preserve_quotes, @cmd "echo \"'\\\"ABC\\\"'\"", &["--preview",
@capture[*] contains("X'\"ABC\"'X");
});
sk_test!(preview_nul_char, @cmd "echo -ne 'a\\0b'", &["--preview", "'echo -en \"{..}\" | hexdump -C'"], {
sk_test!(preview_nul_char, @cmd "echo -ne 'a\\0b'", &["--preview", "'echo -en \"{}\" | hexdump -C'"], {
@capture[0] starts_with(">");
@capture[*] contains("61 00 62");
});