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

test: with interspersed lines

Browse source
This commit is contained in:
Nik Revenco 2025-03-19 23:17:43 +00:00
parent d553b81aa7
commit f830c76a76
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -214,14 +214,14 @@ mod test {
}; };
($any:tt, $commit_msg:literal) => { ($any:tt, $commit_msg:literal) => {
compile_error!(concat!( compile_error!(concat!(
"expected no_commit or nothing for commit ", "expected `no_commit` or nothing for commit ",
$commit_msg $commit_msg
)) ))
}; };
} }
macro_rules! add_flag { macro_rules! insert_flag {
(add, $commit_msg:literal, $line:expr) => { (insert, $commit_msg:literal, $line:expr) => {
true true
}; };
(, $commit_msg:literal, $line:expr) => { (, $commit_msg:literal, $line:expr) => {
@ -229,7 +229,7 @@ mod test {
}; };
($any:tt, $commit_msg:literal, $line:expr) => { ($any:tt, $commit_msg:literal, $line:expr) => {
compile_error!(concat!( compile_error!(concat!(
"expected no_commit or nothing for commit ", "expected `insert` or nothing for commit ",
$commit_msg, $commit_msg,
" line ", " line ",
$line $line
@ -244,6 +244,8 @@ mod test {
/// which then becomes the new contents of the $file /// which then becomes the new contents of the $file
/// ///
/// Each $line gets blamed using blame_line. The $expected is the commit identifier that we are expecting for that line. /// Each $line gets blamed using blame_line. The $expected is the commit identifier that we are expecting for that line.
///
/// $commit_msg can also have a `no_commit` ident next to it, in which case this block won't be committed
macro_rules! assert_line_blame_progress { macro_rules! assert_line_blame_progress {
($($commit_msg:literal $($no_commit:ident)? => $($line:literal $($expected:literal)? $($added:ident)? ),+);+ $(;)?) => {{ ($($commit_msg:literal $($no_commit:ident)? => $($line:literal $($expected:literal)? $($added:ident)? ),+);+ $(;)?) => {{
use std::fs::OpenOptions; use std::fs::OpenOptions;
@ -279,7 +281,7 @@ mod test {
$( $(
line_number += 1; line_number += 1;
let has_add_flag = add_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;
} }
@ -311,24 +313,42 @@ mod test {
"fn main() {" 1, "fn main() {" 1,
"" 1, "" 1,
"}" 1; "}" 1;
// modifying a line works
2 => 2 =>
"fn main() {" 1, "fn main() {" 1,
" one" 2, " one" 2,
"}" 1; "}" 1;
// inserting a line works
3 => 3 =>
"fn main() {" 1, "fn main() {" 1,
" one" 2, " one" 2,
" two" 3, " two" 3,
"}" 1; "}" 1;
// deleting a line works
4 => 4 =>
"fn main() {" 1, "fn main() {" 1,
" two" 3, " two" 3,
"}" 1; "}" 1;
// when a line is inserted in-between the blame order is preserved
5 no_commit => 5 no_commit =>
"fn main() {" 1, "fn main() {" 1,
" hello world" add, " hello world" insert,
" two" 3, " two" 3,
"}" 1; "}" 1;
// Having a bunch of random lines interspersed should not change which lines
// have blame for which commits
6 no_commit =>
" six" insert,
" three" insert,
"fn main() {" 1,
" five" insert,
" four" insert,
" two" 3,
" five" insert,
" four" insert,
"}" 1,
" five" insert,
" four" insert;
}; };
} }