Skip to content

Commit d3dd5d2

Browse files
committed
refactor: rename report_impl parameter: error -> diag
1 parent 7ee6c2c commit d3dd5d2

18 files changed

+30
-30
lines changed

plugin/vscode/quick-lint-js/vscode-diag-reporter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ class vscode_diag_reporter final : public diag_reporter {
137137

138138
::Napi::Array diagnostics() const { return this->diagnostics_; }
139139

140-
void report_impl(diag_type type, void* error) override {
140+
void report_impl(diag_type type, void* diag) override {
141141
vscode_diag_formatter formatter(
142142
/*vscode=*/this->vscode_,
143143
/*env=*/this->env_,
144144
/*diagnostics=*/this->diagnostics_,
145145
/*locator=*/this->locator_,
146146
/*document_uri=*/this->document_uri_);
147-
formatter.format(get_diagnostic_info(type), error);
147+
formatter.format(get_diagnostic_info(type), diag);
148148
}
149149

150150
private:

src/buffering-diag-reporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ buffering_diag_reporter &buffering_diag_reporter::operator=(
5656

5757
buffering_diag_reporter::~buffering_diag_reporter() = default;
5858

59-
void buffering_diag_reporter::report_impl(diag_type type, void *error) {
59+
void buffering_diag_reporter::report_impl(diag_type type, void *diag) {
6060
static constexpr unsigned char error_sizes[] = {
6161
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format) \
6262
sizeof(::quick_lint_js::name),
@@ -66,7 +66,7 @@ void buffering_diag_reporter::report_impl(diag_type type, void *error) {
6666

6767
impl::any_error &e = this->impl_->errors_.emplace_back();
6868
e.type = type;
69-
std::memcpy(&e.error, error, error_sizes[static_cast<std::ptrdiff_t>(type)]);
69+
std::memcpy(&e.error, diag, error_sizes[static_cast<std::ptrdiff_t>(type)]);
7070
}
7171

7272
void buffering_diag_reporter::copy_into(diag_reporter *other) const {

src/c-api-diag-reporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ void c_api_diag_reporter<Diagnostic, Locator>::reset() {
3535

3636
template <class Diagnostic, class Locator>
3737
void c_api_diag_reporter<Diagnostic, Locator>::report_impl(diag_type type,
38-
void *error) {
38+
void *diag) {
3939
c_api_diag_formatter formatter(this);
40-
formatter.format(get_diagnostic_info(type), error);
40+
formatter.format(get_diagnostic_info(type), diag);
4141
}
4242

4343
template <class Diagnostic, class Locator>

src/emacs-lisp-diag-reporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ void emacs_lisp_diag_reporter::set_source(padded_string_view input) {
2222
this->locator_.emplace(input);
2323
}
2424

25-
void emacs_lisp_diag_reporter::report_impl(diag_type type, void *error) {
25+
void emacs_lisp_diag_reporter::report_impl(diag_type type, void *diag) {
2626
QLJS_ASSERT(this->locator_.has_value());
2727
emacs_lisp_diag_formatter formatter(/*output=*/&this->output_,
2828
/*locator=*/*this->locator_);
29-
formatter.format(get_diagnostic_info(type), error);
29+
formatter.format(get_diagnostic_info(type), diag);
3030
}
3131

3232
emacs_lisp_diag_formatter::emacs_lisp_diag_formatter(output_stream *output,

src/lsp-diag-reporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ lsp_diag_reporter::lsp_diag_reporter(byte_buffer &output,
2828

2929
void lsp_diag_reporter::finish() { this->output_.append_copy(u8"]"sv); }
3030

31-
void lsp_diag_reporter::report_impl(diag_type type, void *error) {
31+
void lsp_diag_reporter::report_impl(diag_type type, void *diag) {
3232
if (this->need_comma_) {
3333
this->output_.append_copy(u8",\n"sv);
3434
}
3535
this->need_comma_ = true;
3636
lsp_diag_formatter formatter(/*output=*/this->output_,
3737
/*locator=*/this->locator_);
38-
formatter.format(get_diagnostic_info(type), error);
38+
formatter.format(get_diagnostic_info(type), diag);
3939
}
4040

4141
lsp_diag_formatter::lsp_diag_formatter(byte_buffer &output,

src/quick-lint-js/buffering-diag-reporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class buffering_diag_reporter final : public diag_reporter {
2020

2121
~buffering_diag_reporter() override;
2222

23-
void report_impl(diag_type type, void *error) override;
23+
void report_impl(diag_type type, void *diag) override;
2424

2525
void copy_into(diag_reporter *other) const;
2626
void move_into(diag_reporter *other);

src/quick-lint-js/c-api-diag-reporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class c_api_diag_reporter final : public diag_reporter {
3535

3636
const Diagnostic *get_diagnostics();
3737

38-
void report_impl(diag_type type, void *error) override;
38+
void report_impl(diag_type type, void *diag) override;
3939

4040
private:
4141
char8 *allocate_c_string(string8_view);

src/quick-lint-js/diag-reporter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ class diag_reporter {
2020
virtual ~diag_reporter() = default;
2121

2222
#define QLJS_DIAG_TYPE(name, code, severity, struct_body, format) \
23-
void report(name error) { \
24-
this->report_impl(error_type_from_type<name>, &error); \
23+
void report(name diag) { \
24+
this->report_impl(error_type_from_type<name>, &diag); \
2525
}
2626
QLJS_X_DIAG_TYPES
2727
#undef QLJS_DIAG_TYPE
2828

29-
virtual void report_impl(diag_type type, void *error) = 0;
29+
virtual void report_impl(diag_type type, void *diag) = 0;
3030
};
3131

3232
class null_diag_reporter : public diag_reporter {

src/quick-lint-js/emacs-lisp-diag-reporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class emacs_lisp_diag_reporter final : public diag_reporter {
2626
void set_source(padded_string_view input);
2727
void finish();
2828

29-
void report_impl(diag_type type, void *error) override;
29+
void report_impl(diag_type type, void *diag) override;
3030

3131
private:
3232
output_stream &output_;

src/quick-lint-js/lsp-diag-reporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class lsp_diag_reporter final : public diag_reporter {
2929

3030
void finish();
3131

32-
void report_impl(diag_type type, void *error) override;
32+
void report_impl(diag_type type, void *diag) override;
3333

3434
private:
3535
byte_buffer &output_;

0 commit comments

Comments
 (0)