mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 17:27:35 +00:00
LibDiff: Port Diff::parse_hunks from DeprecatedString to StringView
This commit is contained in:
parent
c60150da15
commit
9dc92f19b8
2 changed files with 6 additions and 5 deletions
|
@ -9,9 +9,9 @@
|
|||
|
||||
namespace Diff {
|
||||
|
||||
ErrorOr<Vector<Hunk>> parse_hunks(DeprecatedString const& diff)
|
||||
ErrorOr<Vector<Hunk>> parse_hunks(StringView diff)
|
||||
{
|
||||
Vector<DeprecatedString> diff_lines = diff.split('\n');
|
||||
Vector<StringView> diff_lines = diff.split_view('\n');
|
||||
if (diff_lines.is_empty())
|
||||
return Vector<Hunk> {};
|
||||
|
||||
|
@ -41,12 +41,12 @@ ErrorOr<Vector<Hunk>> parse_hunks(DeprecatedString const& diff)
|
|||
hunk.target_start_line = current_location.target_start_line;
|
||||
|
||||
while (line_index < diff_lines.size() && diff_lines[line_index][0] == '-') {
|
||||
TRY(hunk.removed_lines.try_append(diff_lines[line_index].substring(1, diff_lines[line_index].length() - 1)));
|
||||
TRY(hunk.removed_lines.try_append(diff_lines[line_index].substring_view(1, diff_lines[line_index].length() - 1)));
|
||||
current_location.apply_offset(1, HunkLocation::LocationType::Original);
|
||||
++line_index;
|
||||
}
|
||||
while (line_index < diff_lines.size() && diff_lines[line_index][0] == '+') {
|
||||
TRY(hunk.added_lines.try_append(diff_lines[line_index].substring(1, diff_lines[line_index].length() - 1)));
|
||||
TRY(hunk.added_lines.try_append(diff_lines[line_index].substring_view(1, diff_lines[line_index].length() - 1)));
|
||||
current_location.apply_offset(1, HunkLocation::LocationType::Target);
|
||||
++line_index;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue