beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibDiff: Coalesce adjacent changes into the same Hunk

Browse source 
Now we keep track of the "current" hunk, and only create a new one
if there's at least a single unmodified lines between changes.
This commit is contained in:
Mustafa Quraish 2021-09-17 14:33:35 -04:00 committed by Andreas Kling
parent 35704ba272
commit 6f423ed26e
Notes: sideshowbarker 2024-07-18 03:30:04 +09:00 
Author: https://github.com/mustafaquraish
Commit: https://github.com/SerenityOS/serenity/commit/6f423ed26e0
Pull-request: https://github.com/SerenityOS/serenity/pull/10096
Reviewed-by: https://github.com/BenWiederhake
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,23 +63,50 @@ Vector<Hunk> from_text(StringView const& old_text, StringView const& new_text)
}
Vector<Hunk> hunks;
Hunk cur_hunk;
bool in_hunk = false;
auto update_hunk = [&](size_t i, size_t j, Direction direction) {
if (!in_hunk) {
in_hunk = true;
cur_hunk = { i, j, {}, {} };
}
if (direction == Direction::Down) {
cur_hunk.added_lines.append(new_lines[j]);
} else if (direction == Direction::Right) {
cur_hunk.removed_lines.append(old_lines[i]);
}
};
auto flush_hunk = [&]() {
if (in_hunk) {
if (cur_hunk.added_lines.size() > 0)
cur_hunk.target_start_line++;
if (cur_hunk.removed_lines.size() > 0)
cur_hunk.original_start_line++;
hunks.append(cur_hunk);
in_hunk = false;
}
};
size_t i = 0;
size_t j = 0;
// FIXME: This creates a hunk per line, very inefficient.
while (i < old_lines.size() && j < new_lines.size()) {
auto& cell = dp(i, j);
if (cell.direction == Direction::Down) {
hunks.append({ i, j, {}, { new_lines[j] } });
update_hunk(i, j, cell.direction);
++j;
} else if (cell.direction == Direction::Right) {
hunks.append({ i, j, { old_lines[i] }, {} });
update_hunk(i, j, cell.direction);
++i;
} else {
++i;
++j;
flush_hunk();
}
}
flush_hunk();
return hunks;
}