Mirrors/navi
2
0
Fork 0
mirror of https://github.com/denisidoro/navi synced 2025-02-16 12:38:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix behavior for snippets with duplicated lines

Browse source
This commit is contained in:
Denis Isidoro 2021-08-07 12:07:17 -03:00 • committed by GitHub
parent d153661d52
commit 59362c0ec8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/parser.rs
View file

@ -113,11 +113,18 @@ fn write_cmd(
stdin: &mut std::process::ChildStdin,
allowlist: Option<&Vec<String>>,
denylist: Option<&Vec<String>>,
visited_lines: &mut HashSet<u64>,
) -> Result<()> {
if item.snippet.len() <= 1 {
return Ok(());
}
let hash = fnv(&format!("{}{}", &item.comment, &item.snippet));
if visited_lines.contains(&hash) {
return Ok(());
}
visited_lines.insert(hash);
if let Some(list) = denylist {
for v in list {
if item.tags.contains(v) {
@ -183,7 +190,7 @@ pub fn read_lines(
}
// tag
else if line.starts_with('%') {
should_break = write_cmd(&item, stdin, allowlist, denylist).is_err();
should_break = write_cmd(&item, stdin, allowlist, denylist, visited_lines).is_err();
item.snippet = String::from("");
item.tags = without_prefix(&line);
}
@ -197,13 +204,13 @@ pub fn read_lines(
}
// comment
else if line.starts_with('#') {
should_break = write_cmd(&item, stdin, allowlist, denylist).is_err();
should_break = write_cmd(&item, stdin, allowlist, denylist, visited_lines).is_err();
item.snippet = String::from("");
item.comment = without_prefix(&line);
}
// variable
else if line.starts_with('$') {
should_break = write_cmd(&item, stdin, allowlist, denylist).is_err();
should_break = write_cmd(&item, stdin, allowlist, denylist, visited_lines).is_err();
item.snippet = String::from("");
let (variable, command, opts) = parse_variable_line(&line).with_context(|| {
format!(
@ -216,12 +223,6 @@ pub fn read_lines(
}
// snippet
else {
let hash = fnv(&format!("{}{}", &item.comment, &line));
if visited_lines.contains(&hash) {
continue;
}
visited_lines.insert(hash);
if !(&item.snippet).is_empty() {
item.snippet.push_str(writer::LINE_SEPARATOR);
}
@ -230,7 +231,7 @@ pub fn read_lines(
}
if !should_break {
let _ = write_cmd(&item, stdin, allowlist, denylist);
let _ = write_cmd(&item, stdin, allowlist, denylist, visited_lines);
}
Ok(())

6
tests/no_prompt_cheats/cases.cheat
View file

@ -8,6 +8,12 @@ echo "foo"
# map -> "_foo_"
echo "<map1>"
# duplicated lines -> "foo\nlorem ipsum\nlorem ipsum\nbaz"
echo foo
echo lorem ipsum
echo lorem ipsum
echo baz
# expand -> "foo"
echo "<expand1>"