RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 21:35:07 +00:00
Code Issues Activity Actions

diff: Show start/end of line ranges in source/target files

Browse source 
This behaves very much like the regular diff command, showing the
start lines and ranges of additions/changes/deletions in both the
source and target files.
This commit is contained in:
Mustafa Quraish 2021-09-17 14:07:34 -04:00 • committed by Andreas Kling
parent 1a7136b37a
commit 4173f2ffad
1 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Utilities/diff.cpp
View file

@ -37,11 +37,34 @@ int main(int argc, char** argv)
auto hunks = Diff::from_text(file1->read_all(), file2->read_all()); auto hunks = Diff::from_text(file1->read_all(), file2->read_all());
for (const auto& hunk : hunks) { for (const auto& hunk : hunks) {
outln("Hunk: {}, {}", hunk.original_start_line, hunk.target_start_line); auto original_start = hunk.original_start_line;
for (const auto& line : hunk.removed_lines) { auto target_start = hunk.target_start_line;
auto num_added = hunk.added_lines.size();
auto num_removed = hunk.removed_lines.size();
StringBuilder sb;
// Source line(s)
sb.appendff("{}", original_start);
if (num_removed > 1)
sb.appendff(",{}", original_start + num_removed - 1);
// Action
if (num_added > 0 && num_removed > 0)
sb.append("c");
else if (num_added > 0)
sb.append("a");
else
sb.append("d");
// Target line(s)
sb.appendff("{}", target_start);
if (num_added > 1)
sb.appendff(",{}", target_start + num_added - 1);
outln("Hunk: {}", sb.build());
for (const auto& line : hunk.removed_lines)
outln("\033[31;1m< {}\033[0m", line); outln("\033[31;1m< {}\033[0m", line);
} if (num_added > 0 && num_removed > 0)
if (hunk.added_lines.size() > 0 && hunk.removed_lines.size() > 0)
outln("---"); outln("---");
for (const auto& line : hunk.added_lines) for (const auto& line : hunk.added_lines)
outln("\033[32;1m> {}\033[0m", line); outln("\033[32;1m> {}\033[0m", line);