kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: add an extra test case

Browse source
This commit is contained in:
Nik Revenco 2025-03-20 00:10:50 +00:00
parent c8eb9f2899
commit 29c49d3d36
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
helix-vcs/src/git/blame.rs
View file

@ -282,7 +282,6 @@ mod test {
let mut added_lines = 0; let mut added_lines = 0;
$( $(
line_number += 1;
let has_add_flag = insert_flag!($($added)?, $commit_msg, $line); let has_add_flag = insert_flag!($($added)?, $commit_msg, $line);
if has_add_flag { if has_add_flag {
added_lines += 1; added_lines += 1;
@ -303,6 +302,7 @@ mod test {
blame_result.as_ref().map(|blame| blame.trim_end()).unwrap_or("<no commit>") blame_result.as_ref().map(|blame| blame.trim_end()).unwrap_or("<no commit>")
); );
)? )?
line_number += 1;
)* )*
)* )*
}}; }};
@ -332,14 +332,14 @@ mod test {
" two" 3, " two" 3,
"}" 1; "}" 1;
// when a line is inserted in-between the blame order is preserved // when a line is inserted in-between the blame order is preserved
5 no_commit => 0 no_commit =>
"fn main() {" 1, "fn main() {" 1,
" hello world" insert, " hello world" insert,
" two" 3, " two" 3,
"}" 1; "}" 1;
// Having a bunch of random lines interspersed should not change which lines // Having a bunch of random lines interspersed should not change which lines
// have blame for which commits // have blame for which commits
6 no_commit => 0 no_commit =>
" six" insert, " six" insert,
" three" insert, " three" insert,
"fn main() {" 1, "fn main() {" 1,
@ -351,6 +351,21 @@ mod test {
"}" 1, "}" 1,
" five" insert, " five" insert,
" four" insert; " four" insert;
// committing all of those insertions should recognize that they are
// from the current commit, while still keeping the information about
// previous commits
5 =>
" six" 5,
" three" 5,
"fn main() {" 1,
" five" 5,
" four" 5,
" two" 3,
" five" 5,
" four" 5,
"}" 1,
" five" 5,
" four" 5;
}; };
} }