diff --git a/Userland/Libraries/LibDiff/Hunks.cpp b/Userland/Libraries/LibDiff/Hunks.cpp index ae029d61c5..4193566e10 100644 --- a/Userland/Libraries/LibDiff/Hunks.cpp +++ b/Userland/Libraries/LibDiff/Hunks.cpp @@ -9,9 +9,9 @@ namespace Diff { -ErrorOr> parse_hunks(DeprecatedString const& diff) +ErrorOr> parse_hunks(StringView diff) { - Vector diff_lines = diff.split('\n'); + Vector diff_lines = diff.split_view('\n'); if (diff_lines.is_empty()) return Vector {}; @@ -41,12 +41,12 @@ ErrorOr> 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; } diff --git a/Userland/Libraries/LibDiff/Hunks.h b/Userland/Libraries/LibDiff/Hunks.h index 256458cd97..f22b012260 100644 --- a/Userland/Libraries/LibDiff/Hunks.h +++ b/Userland/Libraries/LibDiff/Hunks.h @@ -7,6 +7,7 @@ #pragma once #include +#include #include namespace Diff { @@ -32,6 +33,6 @@ struct Hunk { Vector added_lines; }; -ErrorOr> parse_hunks(DeprecatedString const& diff); +ErrorOr> parse_hunks(StringView diff); HunkLocation parse_hunk_location(StringView location_line); };