Mirrors/navi
2
0
Fork 0
mirror of https://github.com/denisidoro/navi synced 2024-11-21 19:13:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #807 from vashirov/i806

Browse source 
Handle multiline snippets better
This commit is contained in:
Denis Isidoro 2022-12-21 08:06:29 -03:00 committed by GitHub
commit ecaeacf1d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/filesystem.rs
View file

@ -18,7 +18,7 @@ pub fn all_cheat_files(path: &Path) -> Vec<String> {
.into_iter()
.filter_map(|e| e.ok())
.map(|e| e.path().to_str().unwrap_or("").to_string())
.filter(|e| e.ends_with(".cheat"))
.filter(|e| e.ends_with(".cheat") || e.ends_with(".cheat.md"))
.collect::<Vec<String>>()
}

10
src/parser.rs
View file

@ -243,6 +243,8 @@ impl<'a> Parser<'a> {
let mut variable_cmd = String::from("");
let mut inside_snippet: bool = false;
for (line_nr, line_result) in lines.enumerate() {
let line = line_result
.with_context(|| format!("Failed to read line number {} in cheatsheet `{}`", line_nr, id))?;
@ -284,7 +286,9 @@ impl<'a> Parser<'a> {
item.comment = without_prefix(&line);
}
// variable
else if !variable_cmd.is_empty() || (line.starts_with('$') && line.contains(':')) {
else if !variable_cmd.is_empty()
|| (line.starts_with('$') && line.contains(':')) && !inside_snippet
{
should_break = self.write_cmd(&item).is_err();
item.snippet = String::from("");
@ -306,6 +310,10 @@ impl<'a> Parser<'a> {
.insert_suggestion(&item.tags, variable, (String::from(command), opts));
}
}
// markdown snippet
else if line.starts_with("```") {
inside_snippet = !inside_snippet;
}
// snippet
else {
if !(&item.snippet).is_empty() {