Skip to content

Commit db16881

Browse files
stragerstrager
committed
refactor: avoid string8_view::string8_view(const char8_t*) constructor
Explicitly make string8_view objects instead of relying on the C-string-to-view converting constructor. Also, use _sv instead of sv.
1 parent 7f7eba5 commit db16881

File tree

70 files changed

+3522
-3396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3522
-3396
lines changed

‎src/quick-lint-js/cli/emacs-lisp-diag-reporter.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ void emacs_lisp_diag_formatter::write_before_message(
4545
emacs_source_range r = this->locator_.range(origin);
4646
emacs_source_position::offset_type beg = r.begin().offset;
4747
emacs_source_position::offset_type end = r.end().offset;
48-
this->output_.append_literal(u8"(("sv);
48+
this->output_.append_literal(u8"(("_sv);
4949
this->output_.append_decimal_integer(beg);
50-
this->output_.append_literal(u8" . "sv);
50+
this->output_.append_literal(u8" . "_sv);
5151
this->output_.append_decimal_integer(end);
52-
this->output_.append_literal(u8") "sv);
52+
this->output_.append_literal(u8") "_sv);
5353
this->output_.append_decimal_integer(static_cast<int>(sev));
54-
this->output_.append_literal(u8" \""sv);
54+
this->output_.append_literal(u8" \""_sv);
5555
this->output_.append_copy(to_string8_view(code));
56-
this->output_.append_literal(u8"\" \""sv);
56+
this->output_.append_literal(u8"\" \""_sv);
5757
}
5858

5959
namespace {
@@ -85,7 +85,7 @@ void emacs_lisp_diag_formatter::write_after_message(
8585
if (sev == diagnostic_severity::note) {
8686
return;
8787
}
88-
this->output_.append_literal(u8"\")"sv);
88+
this->output_.append_literal(u8"\")"_sv);
8989
}
9090
}
9191

‎src/quick-lint-js/cli/options.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,70 +177,70 @@ bool options::dump_errors(output_stream& out) const {
177177
if (this->lsp_server) {
178178
if (this->exit_fail_on.is_user_provided()) {
179179
out.append_copy(
180-
u8"warning: --exit-fail-on ignored with --lsp-server\n"sv);
180+
u8"warning: --exit-fail-on ignored with --lsp-server\n"_sv);
181181
}
182182
if (this->output_format != output_format::default_format) {
183183
out.append_copy(
184-
u8"warning: --output-format ignored with --lsp-server\n"sv);
184+
u8"warning: --output-format ignored with --lsp-server\n"_sv);
185185
}
186186
if (!this->files_to_lint.empty()) {
187187
out.append_copy(
188-
u8"warning: ignoring files given on command line in --lsp-server mode\n"sv);
188+
u8"warning: ignoring files given on command line in --lsp-server mode\n"_sv);
189189
}
190190
if (this->has_config_file) {
191191
out.append_copy(
192-
u8"warning: --config-file ignored in --lsp-server mode\n"sv);
192+
u8"warning: --config-file ignored in --lsp-server mode\n"_sv);
193193
}
194194
}
195195
if (this->has_multiple_stdin) {
196196
out.append_copy(
197-
u8"warning: multiple standard input given on command line\n"sv);
197+
u8"warning: multiple standard input given on command line\n"_sv);
198198
}
199199

200200
if (this->has_vim_file_bufnr && this->lsp_server) {
201201
out.append_copy(
202-
u8"warning: ignoring --vim-file-bufnr in --lsp-server mode\n"sv);
202+
u8"warning: ignoring --vim-file-bufnr in --lsp-server mode\n"_sv);
203203
} else if (this->has_vim_file_bufnr &&
204204
this->output_format != output_format::vim_qflist_json) {
205205
out.append_copy(
206-
u8"warning: --output-format selected which doesn't use --vim-file-bufnr\n"sv);
206+
u8"warning: --output-format selected which doesn't use --vim-file-bufnr\n"_sv);
207207
} else {
208208
for (const auto& argument : this->warning_vim_bufnr_without_file) {
209209
QLJS_ASSERT(argument != nullptr);
210-
out.append_copy(u8"warning: flag: '--vim-file-bufnr="sv);
210+
out.append_copy(u8"warning: flag: '--vim-file-bufnr="_sv);
211211
out.append_copy(to_string8_view(argument));
212212
out.append_copy(
213-
u8"' should be followed by an input file name or --stdin\n"sv);
213+
u8"' should be followed by an input file name or --stdin\n"_sv);
214214
}
215215
}
216216

217217
if (this->has_language && this->lsp_server) {
218-
out.append_copy(u8"warning: ignoring --language in --lsp-server mode\n"sv);
218+
out.append_copy(u8"warning: ignoring --language in --lsp-server mode\n"_sv);
219219
} else {
220220
for (const char* argument : this->warning_language_without_file) {
221221
QLJS_ASSERT(argument != nullptr);
222-
out.append_copy(u8"warning: flag '--language="sv);
222+
out.append_copy(u8"warning: flag '--language="_sv);
223223
out.append_copy(to_string8_view(argument));
224224
out.append_copy(
225-
u8"' should be followed by an input file name or --stdin\n"sv);
225+
u8"' should be followed by an input file name or --stdin\n"_sv);
226226
}
227227
}
228228

229229
for (const auto& option : this->error_unrecognized_options) {
230-
out.append_copy(u8"error: unrecognized option: "sv);
230+
out.append_copy(u8"error: unrecognized option: "_sv);
231231
out.append_copy(to_string8_view(option));
232232
out.append_copy(u8'\n');
233233
have_errors = true;
234234
}
235235
for (const std::string& error :
236236
this->exit_fail_on.parse_errors("--exit-fail-on")) {
237-
out.append_copy(u8"error: "sv);
237+
out.append_copy(u8"error: "_sv);
238238
out.append_copy(to_string8_view(error));
239239
out.append_copy(u8'\n');
240240
have_errors = true;
241241
}
242242
for (const std::string& warning : this->exit_fail_on.parse_warnings()) {
243-
out.append_copy(u8"warning: "sv);
243+
out.append_copy(u8"warning: "_sv);
244244
out.append_copy(to_string8_view(warning));
245245
out.append_copy(u8'\n');
246246
}

‎src/quick-lint-js/cli/text-diag-reporter.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ void text_diag_formatter::write_before_message(
6060
this->output_.append_decimal_integer(p.line_number);
6161
this->output_.append_copy(u8':');
6262
this->output_.append_decimal_integer(p.column_number);
63-
this->output_.append_literal(u8": "sv);
63+
this->output_.append_literal(u8": "_sv);
6464
switch (sev) {
6565
case diagnostic_severity::error:
66-
this->output_.append_literal(u8"error: "sv);
66+
this->output_.append_literal(u8"error: "_sv);
6767
break;
6868
case diagnostic_severity::note:
69-
this->output_.append_literal(u8"note: "sv);
69+
this->output_.append_literal(u8"note: "_sv);
7070
break;
7171
case diagnostic_severity::warning:
72-
this->output_.append_literal(u8"warning: "sv);
72+
this->output_.append_literal(u8"warning: "_sv);
7373
break;
7474
}
7575
}
@@ -85,15 +85,15 @@ void text_diag_formatter::write_after_message(std::string_view code,
8585
const source_code_span &) {
8686
if (this->format_escape_errors_) {
8787
this->output_.append_copy(
88-
u8" [\x1B]8;;https://quick-lint-js.com/errors/"sv);
88+
u8" [\x1B]8;;https://quick-lint-js.com/errors/"_sv);
8989
this->output_.append_copy(to_string8_view(code));
90-
this->output_.append_literal(u8"/\x1B\\"sv);
90+
this->output_.append_literal(u8"/\x1B\\"_sv);
9191
this->output_.append_copy(to_string8_view(code));
92-
this->output_.append_literal(u8"\x1B]8;;\x1B\\]\n"sv);
92+
this->output_.append_literal(u8"\x1B]8;;\x1B\\]\n"_sv);
9393
} else {
94-
this->output_.append_literal(u8" ["sv);
94+
this->output_.append_literal(u8" ["_sv);
9595
this->output_.append_copy(to_string8_view(code));
96-
this->output_.append_literal(u8"]\n"sv);
96+
this->output_.append_literal(u8"]\n"_sv);
9797
}
9898
}
9999
}

‎src/quick-lint-js/cli/vim-qflist-json-diag-reporter.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace quick_lint_js {
1818
vim_qflist_json_diag_reporter::vim_qflist_json_diag_reporter(
1919
translator t, output_stream *output)
2020
: output_(*output), translator_(t) {
21-
this->output_.append_literal(u8"{\"qflist\": ["sv);
21+
this->output_.append_literal(u8"{\"qflist\": ["_sv);
2222
}
2323

2424
void vim_qflist_json_diag_reporter::set_source(padded_string_view input,
@@ -49,12 +49,12 @@ void vim_qflist_json_diag_reporter::set_source(padded_string_view input,
4949
}
5050

5151
void vim_qflist_json_diag_reporter::finish() {
52-
this->output_.append_literal(u8"]}"sv);
52+
this->output_.append_literal(u8"]}"_sv);
5353
}
5454

5555
void vim_qflist_json_diag_reporter::report_impl(diag_type type, void *diag) {
5656
if (this->need_comma_) {
57-
this->output_.append_literal(u8",\n"sv);
57+
this->output_.append_literal(u8",\n"_sv);
5858
}
5959
this->need_comma_ = true;
6060
QLJS_ASSERT(this->locator_.has_value());
@@ -81,31 +81,31 @@ void vim_qflist_json_diag_formatter::write_before_message(
8181
string8_view severity_type{};
8282
switch (sev) {
8383
case diagnostic_severity::error:
84-
severity_type = u8"E"sv;
84+
severity_type = u8"E"_sv;
8585
break;
8686
case diagnostic_severity::note:
8787
// Don't write notes. Only write the main message.
8888
return;
8989
case diagnostic_severity::warning:
90-
severity_type = u8"W"sv;
90+
severity_type = u8"W"_sv;
9191
break;
9292
}
9393

9494
vim_source_range r = this->locator_.range(origin);
9595
auto end_col = origin.begin() == origin.end() ? r.begin.col : (r.end.col - 1);
96-
this->output_.append_literal(u8"{\"col\": "sv);
96+
this->output_.append_literal(u8"{\"col\": "_sv);
9797
this->output_.append_decimal_integer(r.begin.col);
98-
this->output_.append_literal(u8", \"lnum\": "sv);
98+
this->output_.append_literal(u8", \"lnum\": "_sv);
9999
this->output_.append_decimal_integer(r.begin.lnum);
100-
this->output_.append_literal(u8", \"end_col\": "sv);
100+
this->output_.append_literal(u8", \"end_col\": "_sv);
101101
this->output_.append_decimal_integer(end_col);
102-
this->output_.append_literal(u8", \"end_lnum\": "sv);
102+
this->output_.append_literal(u8", \"end_lnum\": "_sv);
103103
this->output_.append_decimal_integer(r.end.lnum);
104-
this->output_.append_literal(u8", \"type\": \""sv);
104+
this->output_.append_literal(u8", \"type\": \""_sv);
105105
this->output_.append_copy(severity_type);
106-
this->output_.append_literal(u8"\", \"nr\": \""sv);
106+
this->output_.append_literal(u8"\", \"nr\": \""_sv);
107107
this->output_.append_copy(to_string8_view(code));
108-
this->output_.append_literal(u8"\", \"vcol\": 0, \"text\": \""sv);
108+
this->output_.append_literal(u8"\", \"vcol\": 0, \"text\": \""_sv);
109109
}
110110

111111
void vim_qflist_json_diag_formatter::write_message_part(
@@ -129,11 +129,11 @@ void vim_qflist_json_diag_formatter::write_after_message(
129129

130130
this->output_.append_copy(u8'\"');
131131
if (!this->bufnr_.empty()) {
132-
this->output_.append_literal(u8", \"bufnr\": "sv);
132+
this->output_.append_literal(u8", \"bufnr\": "_sv);
133133
this->output_.append_copy(to_string8_view(this->bufnr_));
134134
}
135135
if (!this->file_name_.empty()) {
136-
this->output_.append_literal(u8", \"filename\": \""sv);
136+
this->output_.append_literal(u8", \"filename\": \""_sv);
137137
write_json_escaped_string(this->output_, to_string8_view(this->file_name_));
138138
this->output_.append_copy(u8'"');
139139
}

‎src/quick-lint-js/configuration/configuration.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void configuration::reset_global_groups() {
4747
}
4848

4949
bool configuration::add_global_group(string8_view group_name) {
50-
if (group_name == u8"literally-anything"sv) {
50+
if (group_name == u8"literally-anything"_sv) {
5151
this->literally_anything_global_group_enabled_ = true;
5252
return true;
5353
}
@@ -408,7 +408,7 @@ string8_view remove_trailing_json_whitespace(string8_view sv) {
408408
// According to RFC 8259, whitespace characters are U+0009, U+000A, U+000D,
409409
// and U+0020.
410410
std::size_t last_character_index =
411-
sv.find_last_not_of(u8"\u0009\u000a\u000d\u0020"sv);
411+
sv.find_last_not_of(u8"\u0009\u000a\u000d\u0020"_sv);
412412
QLJS_ASSERT(last_character_index != sv.npos);
413413
return sv.substr(0, last_character_index + 1);
414414
}

‎src/quick-lint-js/fe/diagnostic-formatter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ namespace quick_lint_js {
1010
string8_view headlinese_enum_kind(enum_kind ek) noexcept {
1111
switch (ek) {
1212
case enum_kind::const_enum:
13-
return u8"const enum"sv;
13+
return u8"const enum"_sv;
1414
case enum_kind::declare_const_enum:
15-
return u8"declare const enum"sv;
15+
return u8"declare const enum"_sv;
1616
case enum_kind::declare_enum:
17-
return u8"declare enum"sv;
17+
return u8"declare enum"_sv;
1818
case enum_kind::normal:
19-
return u8"enum"sv;
19+
return u8"enum"_sv;
2020
}
2121
QLJS_UNREACHABLE();
2222
}

‎src/quick-lint-js/fe/diagnostic-formatter.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,16 +215,16 @@ inline void diagnostic_formatter<Derived>::format_message(
215215
left_curly_index + 1, right_curly_index - (left_curly_index + 1));
216216

217217
string8_view expanded_parameter;
218-
if (curly_content == u8"0") {
218+
if (curly_content == u8"0"_sv) {
219219
expanded_parameter = this->expand_argument(args, diagnostic, 0);
220-
} else if (curly_content == u8"1") {
220+
} else if (curly_content == u8"1"_sv) {
221221
expanded_parameter = this->expand_argument(args, diagnostic, 1);
222-
} else if (curly_content == u8"1:headlinese") {
222+
} else if (curly_content == u8"1:headlinese"_sv) {
223223
expanded_parameter =
224224
this->expand_argument_headlinese(args, diagnostic, 1);
225-
} else if (curly_content == u8"1:singular") {
225+
} else if (curly_content == u8"1:singular"_sv) {
226226
expanded_parameter = this->expand_argument_singular(args, diagnostic, 1);
227-
} else if (curly_content == u8"2") {
227+
} else if (curly_content == u8"2"_sv) {
228228
expanded_parameter = this->expand_argument(args, diagnostic, 2);
229229
} else {
230230
QLJS_ASSERT(false && "invalid message format: unrecognized placeholder");

‎src/quick-lint-js/fe/expression.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ class expression::_delete final
355355
explicit _delete(expression *child, source_code_span operator_span) noexcept
356356
: expression::expression_with_prefix_operator_base(kind, child,
357357
operator_span) {
358-
QLJS_ASSERT(operator_span.string_view() == u8"delete");
358+
QLJS_ASSERT(operator_span.string_view() == u8"delete"_sv);
359359
}
360360

361361
source_code_span unary_operator_span() {

0 commit comments

Comments
 (0)