RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 14:07:43 +00:00
Code Issues Activity Actions

LibDiff: Generate hunks for new/deleted files

Browse source 
Previously we would fail to generate any hunks if the old or the new
file was empty. We now do, with the original/target line index set to 0,
as specified by POSIX.
This commit is contained in:
Daniel Bertalan 2022-02-25 22:06:54 +01:00 • committed by Linus Groh
parent 7bd68c86d3
commit 4b4177f39c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibDiff/Generator.cpp
View file

@ -107,12 +107,12 @@ Vector<Hunk> from_text(StringView old_text, StringView new_text)
} }
} }
while (i < old_lines.size() && new_lines.size() > 0) { while (i < old_lines.size()) {
update_hunk(i, new_lines.size() - 1, Direction::Right); // Remove a line update_hunk(i, new_lines.is_empty() ? 0 : new_lines.size() - 1, Direction::Right); // Remove a line
++i; ++i;
} }
while (j < new_lines.size() && old_lines.size() > 0) { while (j < new_lines.size()) {
update_hunk(old_lines.size() - 1, j, Direction::Down); // Add a line update_hunk(old_lines.is_empty() ? 0 : old_lines.size() - 1, j, Direction::Down); // Add a line
++j; ++j;
} }