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

AK: Replace the boolean parameter of StringView::lines with a named enum

Browse source
This commit is contained in:
Timothy Flynn 2024-03-08 11:27:48 -05:00 committed by Tim Flynn
parent d9349f1510
commit 07a27b2ec0
Notes: sideshowbarker 2024-07-17 06:54:15 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/07a27b2ec0
Pull-request: https://github.com/SerenityOS/serenity/pull/23525
Reviewed-by: https://github.com/LucasChollet ✅
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AK/StringView.cpp
View file

@ -68,12 +68,12 @@ Vector<StringView> StringView::split_view(StringView separator, SplitBehavior sp
return parts; return parts;
} }
Vector<StringView> StringView::lines(bool consider_cr) const Vector<StringView> StringView::lines(ConsiderCarriageReturn consider_carriage_return) const
{ {
if (is_empty()) if (is_empty())
return {}; return {};
if (!consider_cr) if (consider_carriage_return == ConsiderCarriageReturn::No)
return split_view('\n', SplitBehavior::KeepEmpty); return split_view('\n', SplitBehavior::KeepEmpty);
Vector<StringView> v; Vector<StringView> v;

6
AK/StringView.h
View file

@ -235,7 +235,11 @@ public:
// 0.29, the spec defines a line ending as "a newline (U+000A), a carriage // 0.29, the spec defines a line ending as "a newline (U+000A), a carriage
// return (U+000D) not followed by a newline, or a carriage return and a // return (U+000D) not followed by a newline, or a carriage return and a
// following newline.". // following newline.".
[[nodiscard]] Vector<StringView> lines(bool consider_cr = true) const; enum class ConsiderCarriageReturn {
No,
Yes,
};
[[nodiscard]] Vector<StringView> lines(ConsiderCarriageReturn = ConsiderCarriageReturn::Yes) const;
// Create a new substring view of this string view, starting either at the beginning of // Create a new substring view of this string view, starting either at the beginning of
// the given substring view, or after its end, and continuing until the end of this string // the given substring view, or after its end, and continuing until the end of this string

2
Userland/Applications/Spreadsheet/SpreadsheetView.cpp
View file

@ -425,7 +425,7 @@ SpreadsheetView::SpreadsheetView(Sheet& sheet)
StringView urls { data.data(), data.size() }; StringView urls { data.data(), data.size() };
Vector<Position> source_positions, target_positions; Vector<Position> source_positions, target_positions;
for (auto& line : urls.lines(false)) { for (auto& line : urls.lines(StringView::ConsiderCarriageReturn::No)) {
auto position = m_sheet->position_from_url(line); auto position = m_sheet->position_from_url(line);
if (position.has_value()) if (position.has_value())
source_positions.append(position.release_value()); source_positions.append(position.release_value());

2
Userland/Libraries/LibRegex/RegexMatch.h
View file

@ -303,7 +303,7 @@ public:
{ {
return m_view.visit( return m_view.visit(
[](StringView view) { [](StringView view) {
auto views = view.lines(false); auto views = view.lines(StringView::ConsiderCarriageReturn::No);
Vector<RegexStringView> new_views; Vector<RegexStringView> new_views;
for (auto& view : views) for (auto& view : views)
new_views.empend(view); new_views.empend(view);