Skip to content

Commit 41ac971

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer: rename Lint*Context classes
For the analyzer plugin APIs, these classes should not have the word 'Lint' in them, as they are used for all analysis rules, whether they report lints or warnings. * LinterContext -> RuleContext * LinterContextWithParsedResults -> RuleContextWithParsedResults * LinterContextWithResolvedResults -> RuleContextWithResolvedResults * LintRuleUnitContext -> RuleUnitContext I'm open to better names for these. Some of these suffer from a chain-of-nouns name (a "RuleUnitContext" is a Context for a Unit for a Rule). So we could go with "UnitContextForRule" and "ContextForRule" or other ideas like that. Only RuleContext and RuleUnitContext will be public API. Change-Id: I5550736beaba7e39b36e7b5584ca6d023aa4d02b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431703 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent e4cac29 commit 41ac971

File tree

6 files changed

+149
-140
lines changed

6 files changed

+149
-140
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,24 +273,24 @@ class BulkFixProcessor {
273273
}
274274
if (parsedLibrary is ParsedLibraryResult) {
275275
var errorListener = RecordingErrorListener();
276-
var unitContexts = <LintRuleUnitContext>[];
276+
var contextUnits = <RuleContextUnit>[];
277277

278278
for (var parsedUnit in parsedLibrary.units) {
279279
var errorReporter = ErrorReporter(
280280
errorListener,
281281
StringSource(parsedUnit.content, null),
282282
);
283-
unitContexts.add(
284-
LintRuleUnitContext(
283+
contextUnits.add(
284+
RuleContextUnit(
285285
file: parsedUnit.file,
286286
content: parsedUnit.content,
287287
errorReporter: errorReporter,
288288
unit: parsedUnit.unit,
289289
),
290290
);
291291
}
292-
for (var unitContext in unitContexts) {
293-
_computeParsedResultLint(unitContext, unitContexts);
292+
for (var unitContext in contextUnits) {
293+
_computeParsedResultLint(unitContext, contextUnits);
294294
}
295295
await _fixErrorsInParsedLibrary(
296296
parsedLibrary,
@@ -531,11 +531,13 @@ class BulkFixProcessor {
531531
/// Computes lint for lint rules with names [_syntacticLintCodes] (rules that
532532
/// do not require [ResolvedUnitResult]s).
533533
void _computeParsedResultLint(
534-
LintRuleUnitContext currentUnit,
535-
List<LintRuleUnitContext> allUnits,
534+
RuleContextUnit currentUnit,
535+
List<RuleContextUnit> allUnits,
536536
) {
537537
var nodeRegistry = RuleVisitorRegistry(enableTiming: false);
538-
var context = LinterContextWithParsedResults(allUnits, currentUnit);
538+
// TODO(srawlins): We are passing `currentUnit` in as `definingUnit`. Seems
539+
// wrong.
540+
var context = RuleContextWithParsedResults(allUnits, currentUnit);
539541
var lintRules =
540542
_syntacticLintCodes
541543
.map((name) => Registry.ruleRegistry.getRule(name))

pkg/analysis_server_plugin/lib/src/plugin_server.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,15 +321,15 @@ class PluginServer {
321321
var errorReporter = ErrorReporter(
322322
listener, unitResult.libraryElement2.firstFragment.source);
323323

324-
var currentUnit = LintRuleUnitContext(
324+
var currentUnit = RuleContextUnit(
325325
file: unitResult.file,
326326
content: unitResult.content,
327327
errorReporter: errorReporter,
328328
unit: unitResult.unit,
329329
);
330330
var allUnits = [
331331
for (var unitResult in libraryResult.units)
332-
LintRuleUnitContext(
332+
RuleContextUnit(
333333
file: unitResult.file,
334334
content: unitResult.content,
335335
errorReporter: errorReporter,
@@ -341,7 +341,7 @@ class PluginServer {
341341
// `benchhmark.dart` script does.
342342
var nodeRegistry = RuleVisitorRegistry(enableTiming: false);
343343

344-
var context = LinterContextWithResolvedResults(
344+
var context = RuleContextWithResolvedResults(
345345
allUnits,
346346
currentUnit,
347347
libraryResult.element2.typeProvider,

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,11 @@ class LibraryAnalyzer {
381381

382382
void _computeLints() {
383383
var definingUnit = _libraryElement.definingCompilationUnit;
384-
var analysesToContextUnits = <FileAnalysis, LintRuleUnitContext>{};
385-
LintRuleUnitContext? definingContextUnit;
384+
var analysesToContextUnits = <FileAnalysis, RuleContextUnit>{};
385+
RuleContextUnit? definingContextUnit;
386386
WorkspacePackageImpl? workspacePackage;
387387
for (var fileAnalysis in _libraryFiles.values) {
388-
var linterContextUnit = LintRuleUnitContext(
388+
var linterContextUnit = RuleContextUnit(
389389
file: fileAnalysis.file.resource,
390390
content: fileAnalysis.file.content,
391391
unit: fileAnalysis.unit,
@@ -402,7 +402,7 @@ class LibraryAnalyzer {
402402
definingContextUnit ??= allUnits.first;
403403

404404
var nodeRegistry = RuleVisitorRegistry(enableTiming: _enableLintRuleTiming);
405-
var context = LinterContextWithResolvedResults(
405+
var context = RuleContextWithResolvedResults(
406406
allUnits,
407407
definingContextUnit,
408408
_typeProvider,

0 commit comments

Comments
 (0)