mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

diff: extract line number handling from show_color_words_diff_line()

Browse source 
This seems more consistent with !can_inline case, and we can remove extra
vec![] allocation from context line processing.
This commit is contained in:
Yuya Nishihara 2024-08-27 13:25:04 +09:00
parent 47323c883a
commit 79e76c5dad
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cli/src/diff_util.rs
View file

@ -21,6 +21,7 @@ use std::ops::Range;
use std::path::Path; use std::path::Path;
use std::path::PathBuf; use std::path::PathBuf;
use bstr::BStr;
use futures::executor::block_on_stream; use futures::executor::block_on_stream;
use futures::stream::BoxStream; use futures::stream::BoxStream;
use futures::StreamExt; use futures::StreamExt;
@ -40,7 +41,6 @@ use jj_lib::copies::CopyOperation;
use jj_lib::copies::CopyRecords; use jj_lib::copies::CopyRecords;
use jj_lib::diff::Diff; use jj_lib::diff::Diff;
use jj_lib::diff::DiffHunk; use jj_lib::diff::DiffHunk;
use jj_lib::files::DiffLine;
use jj_lib::files::DiffLineHunkSide; use jj_lib::files::DiffLineHunkSide;
use jj_lib::files::DiffLineIterator; use jj_lib::files::DiffLineIterator;
use jj_lib::files::DiffLineNumber; use jj_lib::files::DiffLineNumber;
@ -514,7 +514,16 @@ fn show_color_words_diff_hunks(
let mut diff_line_iter = let mut diff_line_iter =
DiffLineIterator::with_line_number(word_diff_hunks.iter(), line_number); DiffLineIterator::with_line_number(word_diff_hunks.iter(), line_number);
for diff_line in diff_line_iter.by_ref() { for diff_line in diff_line_iter.by_ref() {
show_color_words_diff_line(formatter, &diff_line)?; show_color_words_line_number(
formatter,
diff_line
.has_left_content()
.then_some(diff_line.line_number.left),
diff_line
.has_right_content()
.then_some(diff_line.line_number.right),
)?;
show_color_words_inline_hunks(formatter, &diff_line.hunks)?;
} }
line_number = diff_line_iter.next_line_number(); line_number = diff_line_iter.next_line_number();
} else { } else {
@ -548,11 +557,8 @@ fn show_color_words_context_lines(
const SKIPPED_CONTEXT_LINE: &str = " ...\n"; const SKIPPED_CONTEXT_LINE: &str = " ...\n";
let mut lines = content.split_inclusive(|b| *b == b'\n').fuse(); let mut lines = content.split_inclusive(|b| *b == b'\n').fuse();
for line in lines.by_ref().take(num_after) { for line in lines.by_ref().take(num_after) {
let diff_line = DiffLine { show_color_words_line_number(formatter, Some(line_number.left), Some(line_number.right))?;
line_number, show_color_words_inline_hunks(formatter, &[(DiffLineHunkSide::Both, line.as_ref())])?;
hunks: vec![(DiffLineHunkSide::Both, line.as_ref())],
};
show_color_words_diff_line(formatter, &diff_line)?;
line_number.left += 1; line_number.left += 1;
line_number.right += 1; line_number.right += 1;
} }
@ -565,11 +571,8 @@ fn show_color_words_context_lines(
line_number.right += num_skipped + 1; line_number.right += num_skipped + 1;
} }
for line in before_lines.into_iter().rev() { for line in before_lines.into_iter().rev() {
let diff_line = DiffLine { show_color_words_line_number(formatter, Some(line_number.left), Some(line_number.right))?;
line_number, show_color_words_inline_hunks(formatter, &[(DiffLineHunkSide::Both, line.as_ref())])?;
hunks: vec![(DiffLineHunkSide::Both, line.as_ref())],
};
show_color_words_diff_line(formatter, &diff_line)?;
line_number.left += 1; line_number.left += 1;
line_number.right += 1; line_number.right += 1;
} }
@ -600,21 +603,12 @@ fn show_color_words_line_number(
Ok(()) Ok(())
} }
/// Prints `diff_line` which may contain tokens originating from both sides. /// Prints line hunks which may contain tokens originating from both sides.
fn show_color_words_diff_line( fn show_color_words_inline_hunks(
formatter: &mut dyn Formatter, formatter: &mut dyn Formatter,
diff_line: &DiffLine, line_hunks: &[(DiffLineHunkSide, &BStr)],
) -> io::Result<()> { ) -> io::Result<()> {
show_color_words_line_number( for (side, data) in line_hunks {
formatter,
diff_line
.has_left_content()
.then_some(diff_line.line_number.left),
diff_line
.has_right_content()
.then_some(diff_line.line_number.right),
)?;
for (side, data) in &diff_line.hunks {
let label = match side { let label = match side {
DiffLineHunkSide::Both => None, DiffLineHunkSide::Both => None,
DiffLineHunkSide::Left => Some("removed"), DiffLineHunkSide::Left => Some("removed"),
@ -628,7 +622,7 @@ fn show_color_words_diff_line(
formatter.write_all(data)?; formatter.write_all(data)?;
} }
} }
let (_, data) = diff_line.hunks.last().expect("diff line must not be empty"); let (_, data) = line_hunks.last().expect("diff line must not be empty");
if !data.ends_with(b"\n") { if !data.ends_with(b"\n") {
writeln!(formatter)?; writeln!(formatter)?;
}; };