Skip to content

Commit f51d37e

Browse files
srawlinsCommit Queue
srawlins
authored and
Commit Queue
committed
analyzer: Rename ErrorReporter to DiagnosticReporter
Work towards #60635 Change-Id: I84b095199773040fc0444364964654c4373a9d77 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433740 Reviewed-by: Paul Berry <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent f9860f9 commit f51d37e

File tree

109 files changed

+1536
-1361
lines changed

Some content is hidden

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

109 files changed

+1536
-1361
lines changed

‎pkg/analysis_server/lib/src/context_manager.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,11 @@ class ContextManagerImpl implements ContextManager {
474474
try {
475475
var content = file.readAsStringSync();
476476
var diagnosticListener = RecordingDiagnosticListener();
477-
var errorReporter = ErrorReporter(diagnosticListener, FileSource(file));
478-
var parser = TransformSetParser(errorReporter, packageName);
477+
var diagnosticReporter = DiagnosticReporter(
478+
diagnosticListener,
479+
FileSource(file),
480+
);
481+
var parser = TransformSetParser(diagnosticReporter, packageName);
479482
parser.parse(content);
480483
var converter = AnalyzerConverter();
481484
var analysisOptions = driver.getAnalysisOptionsForFile(file);

‎pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@ class BulkFixProcessor {
275275
var contextUnits = <RuleContextUnit>[];
276276

277277
for (var parsedUnit in parsedLibrary.units) {
278-
var errorReporter = ErrorReporter(
278+
var diagnosticReporter = DiagnosticReporter(
279279
diagnosticListener,
280280
StringSource(parsedUnit.content, null),
281281
);
282282
contextUnits.add(
283283
RuleContextUnit(
284284
file: parsedUnit.file,
285285
content: parsedUnit.content,
286-
errorReporter: errorReporter,
286+
diagnosticReporter: diagnosticReporter,
287287
unit: parsedUnit.unit,
288288
),
289289
);
@@ -542,7 +542,7 @@ class BulkFixProcessor {
542542
.map((name) => Registry.ruleRegistry.getRule(name))
543543
.nonNulls;
544544
for (var lintRule in lintRules) {
545-
lintRule.reporter = currentUnit.errorReporter;
545+
lintRule.reporter = currentUnit.diagnosticReporter;
546546
lintRule.registerNodeProcessors(nodeRegistry, context);
547547
}
548548

‎pkg/analysis_server/lib/src/services/correction/fix/data_driven/code_fragment_parser.dart‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import 'package:analyzer/src/utilities/extensions/string.dart';
1414

1515
/// A parser for the textual representation of a code fragment.
1616
class CodeFragmentParser {
17-
/// The error reporter to which diagnostics will be reported.
18-
final ErrorReporter errorReporter;
17+
/// The diagnostic reporter to which diagnostics will be reported.
18+
final DiagnosticReporter diagnosticReporter;
1919

2020
/// The scope in which variables can be looked up.
2121
VariableScope variableScope;
@@ -30,8 +30,8 @@ class CodeFragmentParser {
3030
/// The index in the [_tokens] of the next token to be consumed.
3131
int currentIndex = 0;
3232

33-
/// Initialize a newly created parser to report errors to the [errorReporter].
34-
CodeFragmentParser(this.errorReporter, {VariableScope? scope})
33+
/// Initialize a newly created parser to report errors to the [diagnosticReporter].
34+
CodeFragmentParser(this.diagnosticReporter, {VariableScope? scope})
3535
: variableScope = scope ?? VariableScope(null, {});
3636

3737
/// Return the current token, or `null` if the end of the tokens has been
@@ -54,7 +54,7 @@ class CodeFragmentParser {
5454
List<Accessor>? parseAccessors(String content, int delta) {
5555
this.delta = delta;
5656
var scannedTokens =
57-
_CodeFragmentScanner(content, delta, errorReporter).scan();
57+
_CodeFragmentScanner(content, delta, diagnosticReporter).scan();
5858
if (scannedTokens == null) {
5959
// The error has already been reported.
6060
return null;
@@ -80,7 +80,7 @@ class CodeFragmentParser {
8080
}
8181
accessors.add(accessor);
8282
} else {
83-
errorReporter.atOffset(
83+
diagnosticReporter.atOffset(
8484
offset: token.offset + delta,
8585
length: token.length,
8686
diagnosticCode: TransformSetErrorCode.wrongToken,
@@ -100,7 +100,7 @@ class CodeFragmentParser {
100100
Expression? parseCondition(String content, int delta) {
101101
this.delta = delta;
102102
var scannedTokens =
103-
_CodeFragmentScanner(content, delta, errorReporter).scan();
103+
_CodeFragmentScanner(content, delta, diagnosticReporter).scan();
104104
if (scannedTokens == null) {
105105
// The error has already been reported.
106106
return null;
@@ -110,7 +110,7 @@ class CodeFragmentParser {
110110
var expression = _parseLogicalAndExpression();
111111
if (currentIndex < _tokens.length) {
112112
var token = _tokens[currentIndex];
113-
errorReporter.atOffset(
113+
diagnosticReporter.atOffset(
114114
offset: token.offset + delta,
115115
length: token.length,
116116
diagnosticCode: TransformSetErrorCode.unexpectedToken,
@@ -148,7 +148,7 @@ class CodeFragmentParser {
148148
offset = last.offset;
149149
length = last.length;
150150
}
151-
errorReporter.atOffset(
151+
diagnosticReporter.atOffset(
152152
offset: offset + delta,
153153
length: length,
154154
diagnosticCode: TransformSetErrorCode.missingToken,
@@ -157,7 +157,7 @@ class CodeFragmentParser {
157157
return null;
158158
}
159159
if (!validKinds.contains(token.kind)) {
160-
errorReporter.atOffset(
160+
diagnosticReporter.atOffset(
161161
offset: token.offset + delta,
162162
length: token.length,
163163
diagnosticCode: TransformSetErrorCode.wrongToken,
@@ -230,7 +230,7 @@ class CodeFragmentParser {
230230
advance();
231231
return TypeArgumentAccessor(argumentIndex);
232232
} else {
233-
errorReporter.atOffset(
233+
diagnosticReporter.atOffset(
234234
offset: token.offset + delta,
235235
length: token.length,
236236
diagnosticCode: TransformSetErrorCode.unknownAccessor,
@@ -310,7 +310,7 @@ class CodeFragmentParser {
310310
var variableName = token.lexeme;
311311
var generator = variableScope.lookup(variableName);
312312
if (generator == null) {
313-
errorReporter.atOffset(
313+
diagnosticReporter.atOffset(
314314
offset: token.offset + delta,
315315
length: token.length,
316316
diagnosticCode: TransformSetErrorCode.undefinedVariable,
@@ -341,7 +341,7 @@ class CodeFragmentParser {
341341
offset = token.offset + delta;
342342
length = token.length;
343343
}
344-
errorReporter.atOffset(
344+
diagnosticReporter.atOffset(
345345
offset: offset,
346346
length: length,
347347
diagnosticCode: TransformSetErrorCode.expectedPrimary,
@@ -372,11 +372,11 @@ class _CodeFragmentScanner {
372372
/// The offset in the file of the first character in the string being scanned.
373373
final int delta;
374374

375-
/// The error reporter to which diagnostics will be reported.
376-
final ErrorReporter errorReporter;
375+
/// The diagnostic reporter to which diagnostics will be reported.
376+
final DiagnosticReporter _diagnosticReporter;
377377

378378
/// Initialize a newly created scanner to scan the given [content].
379-
_CodeFragmentScanner(this.content, this.delta, this.errorReporter)
379+
_CodeFragmentScanner(this.content, this.delta, this._diagnosticReporter)
380380
: length = content.length;
381381

382382
/// Return the tokens in the content, or `null` if there is an error in the
@@ -468,7 +468,7 @@ class _CodeFragmentScanner {
468468

469469
/// Report the presence of an invalid character at the given [offset].
470470
Null _reportInvalidCharacter(int offset) {
471-
errorReporter.atOffset(
471+
_diagnosticReporter.atOffset(
472472
offset: offset + delta,
473473
length: 1,
474474
diagnosticCode: TransformSetErrorCode.invalidCharacter,

‎pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class TransformSetManager {
115115
try {
116116
var content = file.readAsStringSync();
117117
var parser = TransformSetParser(
118-
ErrorReporter(DiagnosticListener.NULL_LISTENER, FileSource(file)),
118+
DiagnosticReporter(DiagnosticListener.NULL_LISTENER, FileSource(file)),
119119
packageName,
120120
);
121121
return parser.parse(content);

‎pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ class TransformSetParser {
138138
/// includes removing support for keys and adding a new required key.
139139
static const int currentVersion = 1;
140140

141-
/// The error reporter to which diagnostics will be reported.
142-
final ErrorReporter errorReporter;
141+
/// The diagnostic reporter to which diagnostics will be reported.
142+
final DiagnosticReporter _diagnosticReporter;
143143

144144
/// The name of the package from which the data file being translated was
145145
/// found, or `null` for the SDK.
@@ -159,8 +159,8 @@ class TransformSetParser {
159159
List<ParameterModification>? _parameterModifications;
160160

161161
/// Initialize a newly created parser to report diagnostics to the
162-
/// [errorReporter].
163-
TransformSetParser(this.errorReporter, this.packageName);
162+
/// [_diagnosticReporter].
163+
TransformSetParser(this._diagnosticReporter, this.packageName);
164164

165165
/// Return the result of parsing the file [content] into a transform set, or
166166
/// `null` if the content does not represent a valid transform set.
@@ -192,7 +192,7 @@ class TransformSetParser {
192192
}
193193
var endIndex = template.indexOf(_closeComponent, variableStart + 2);
194194
if (endIndex < 0) {
195-
errorReporter.atOffset(
195+
_diagnosticReporter.atOffset(
196196
offset: templateOffset + variableStart,
197197
length: 2,
198198
diagnosticCode: TransformSetErrorCode.missingTemplateEnd,
@@ -204,7 +204,7 @@ class TransformSetParser {
204204
var name = template.substring(variableStart + 2, endIndex).trim();
205205
var generator = variableScope.lookup(name);
206206
if (generator == null) {
207-
errorReporter.atOffset(
207+
_diagnosticReporter.atOffset(
208208
offset: templateOffset + template.indexOf(name, variableStart),
209209
length: name.length,
210210
diagnosticCode: TransformSetErrorCode.undefinedVariable,
@@ -258,7 +258,7 @@ class TransformSetParser {
258258
var span = e.span;
259259
var offset = span?.start.offset ?? 0;
260260
var length = span?.length ?? 0;
261-
errorReporter.atOffset(
261+
_diagnosticReporter.atOffset(
262262
offset: offset,
263263
length: length,
264264
diagnosticCode: TransformSetErrorCode.yamlSyntaxError,
@@ -277,7 +277,7 @@ class TransformSetParser {
277277
List<String> arguments = const [],
278278
]) {
279279
var span = node.span;
280-
errorReporter.atOffset(
280+
_diagnosticReporter.atOffset(
281281
offset: span.start.offset,
282282
length: span.length,
283283
diagnosticCode: code,
@@ -670,7 +670,7 @@ class TransformSetParser {
670670
return null;
671671
}
672672
var accessors = CodeFragmentParser(
673-
errorReporter,
673+
_diagnosticReporter,
674674
).parseAccessors(value, _offsetOfString(valueNode));
675675
if (accessors == null) {
676676
// The error has already been reported.
@@ -718,7 +718,7 @@ class TransformSetParser {
718718
);
719719
if (requiredIfNode is YamlScalar && requiredIfText != null) {
720720
requiredIfCondition = CodeFragmentParser(
721-
errorReporter,
721+
_diagnosticReporter,
722722
scope: variableScope,
723723
).parseCondition(requiredIfText, _offsetOfString(requiredIfNode));
724724
if (requiredIfCondition == null) {
@@ -780,7 +780,7 @@ class TransformSetParser {
780780
expressionText != null &&
781781
changes != null) {
782782
var expression = CodeFragmentParser(
783-
errorReporter,
783+
_diagnosticReporter,
784784
scope: transformVariableScope,
785785
).parseCondition(expressionText, _offsetOfString(expressionNode));
786786
if (expression != null) {

‎pkg/analysis_server/test/services/linter/linter_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void main() {
2323
class LinterRuleOptionsValidatorTest {
2424
late RecordingDiagnosticListener recorder;
2525

26-
late ErrorReporter reporter;
26+
late DiagnosticReporter reporter;
2727

2828
List<Diagnostic> get diagnostics => recorder.diagnostics;
2929

@@ -32,7 +32,7 @@ class LinterRuleOptionsValidatorTest {
3232
void setUp() {
3333
registerLintRules();
3434
recorder = RecordingDiagnosticListener();
35-
reporter = ErrorReporter(recorder, _TestSource());
35+
reporter = DiagnosticReporter(recorder, _TestSource());
3636
}
3737

3838
void test_linter_defined_rules() {

‎pkg/analysis_server/test/src/services/correction/fix/data_driven/code_fragment_parser_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ abstract class AbstractCodeFragmentParserTest {
7777
GatheringDiagnosticListener listener, {
7878
List<String>? variables,
7979
}) {
80-
var errorReporter = ErrorReporter(listener, MockSource());
80+
var diagnosticReporter = DiagnosticReporter(listener, MockSource());
8181
var map = <String, ValueGenerator>{};
8282
if (variables != null) {
8383
for (var variableName in variables) {
8484
map[variableName] = CodeFragment([]);
8585
}
8686
}
8787
var scope = VariableScope(null, map);
88-
return CodeFragmentParser(errorReporter, scope: scope);
88+
return CodeFragmentParser(diagnosticReporter, scope: scope);
8989
}
9090
}
9191

‎pkg/analysis_server/test/src/services/correction/fix/data_driven/transform_set_parser_test_support.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ abstract class AbstractTransformSetParserTest {
4747
);
4848

4949
void parse(String content) {
50-
var errorReporter = ErrorReporter(
50+
var diagnosticReporter = DiagnosticReporter(
5151
diagnosticListener,
5252
MockSource(fullName: 'data.yaml'),
5353
);
54-
var parser = TransformSetParser(errorReporter, 'myPackage');
54+
var parser = TransformSetParser(diagnosticReporter, 'myPackage');
5555
result = parser.parse(content);
5656
}
5757
}

‎pkg/analysis_server_plugin/lib/src/plugin_server.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,21 +319,21 @@ class PluginServer {
319319
return const [];
320320
}
321321
var listener = RecordingDiagnosticListener();
322-
var errorReporter = ErrorReporter(
322+
var diagnosticReporter = DiagnosticReporter(
323323
listener, unitResult.libraryElement2.firstFragment.source);
324324

325325
var currentUnit = RuleContextUnit(
326326
file: unitResult.file,
327327
content: unitResult.content,
328-
errorReporter: errorReporter,
328+
diagnosticReporter: diagnosticReporter,
329329
unit: unitResult.unit,
330330
);
331331
var allUnits = [
332332
for (var unitResult in libraryResult.units)
333333
RuleContextUnit(
334334
file: unitResult.file,
335335
content: unitResult.content,
336-
errorReporter: errorReporter,
336+
diagnosticReporter: diagnosticReporter,
337337
unit: unitResult.unit,
338338
),
339339
];
@@ -360,7 +360,7 @@ class PluginServer {
360360
var rules =
361361
Registry.ruleRegistry.enabled(configuration.diagnosticConfigs);
362362
for (var rule in rules) {
363-
rule.reporter = errorReporter;
363+
rule.reporter = diagnosticReporter;
364364
// TODO(srawlins): Enable timing similar to what the linter package's
365365
// `benchhmark.dart` script does.
366366
rule.registerNodeProcessors(nodeRegistry, context);

‎pkg/analyzer/api.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package:analyzer/analysis_rule/analysis_rule.dart:
66
incompatibleRules (getter: List<String>)
77
name (getter: String)
88
pubspecVisitor (getter: PubspecVisitor<dynamic>?)
9-
reporter= (setter: ErrorReporter)
9+
reporter= (setter: DiagnosticReporter)
1010
state (getter: RuleState)
1111
registerNodeProcessors (method: void Function(RuleVisitorRegistry, RuleContext))
1212
AnalysisRule (class extends AbstractAnalysisRule):
@@ -93,9 +93,9 @@ package:analyzer/analysis_rule/rule_context.dart:
9393
typeSystem (getter: TypeSystem)
9494
isFeatureEnabled (method: bool Function(Feature))
9595
RuleContextUnit (class extends Object):
96-
new (constructor: RuleContextUnit Function({required String content, required ErrorReporter errorReporter, required File file, required CompilationUnit unit}))
96+
new (constructor: RuleContextUnit Function({required String content, required DiagnosticReporter diagnosticReporter, required File file, required CompilationUnit unit}))
9797
content (getter: String)
98-
errorReporter (getter: ErrorReporter)
98+
diagnosticReporter (getter: DiagnosticReporter)
9999
file (getter: File)
100100
unit (getter: CompilationUnit)
101101
package:analyzer/analysis_rule/rule_state.dart:
@@ -4754,8 +4754,8 @@ package:analyzer/error/listener.dart:
47544754
NULL_LISTENER (static getter: DiagnosticListener)
47554755
new (constructor: DiagnosticListener Function())
47564756
onError (method: void Function(Diagnostic))
4757-
ErrorReporter (class extends Object):
4758-
new (constructor: ErrorReporter Function(DiagnosticListener, Source))
4757+
DiagnosticReporter (class extends Object):
4758+
new (constructor: DiagnosticReporter Function(DiagnosticListener, Source))
47594759
lockLevel (getter: int)
47604760
lockLevel= (setter: int)
47614761
source (getter: Source)
@@ -4775,6 +4775,7 @@ package:analyzer/error/listener.dart:
47754775
onError (method: void Function(Diagnostic))
47764776
AnalysisErrorListener (type alias for DiagnosticListener, deprecated)
47774777
BooleanErrorListener (type alias for BooleanDiagnosticListener, deprecated)
4778+
ErrorReporter (type alias for DiagnosticReporter, deprecated)
47784779
RecorderingErrorListener (type alias for RecordingDiagnosticListener, deprecated)
47794780
package:analyzer/exception/exception.dart:
47804781
AnalysisException (class extends Object implements Exception):

0 commit comments

Comments
 (0)