From a468bd2e22e8a7463d0fa3d365256aef2ae22ffd Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Wed, 4 Aug 2021 16:26:37 +0000 Subject: [PATCH] Tweaks for LinterExceptionHandler. Boolean parameters are easier to understand when they are named. And the word "linter" does not add much, we already know this. Change-Id: Ib34488acd43230ac516b5fe2d3928c96dfbc6a0a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/208900 Reviewed-by: Brian Wilkerson Commit-Queue: Konstantin Shcheglov --- .../lib/src/dart/analysis/library_analyzer.dart | 10 +++++++--- pkg/analyzer/lib/src/dart/ast/utilities.dart | 8 +++++--- pkg/analyzer/lib/src/dart/micro/library_analyzer.dart | 10 +++++++--- pkg/analyzer/lib/src/lint/linter_visitor.dart | 4 ++-- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart index af4dab41dc2..c8caff362ff 100644 --- a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart +++ b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart @@ -352,10 +352,14 @@ class LibraryAnalyzer { } // Run lints that handle specific node types. - unit.accept(LinterVisitor( + unit.accept( + LinterVisitor( nodeRegistry, - LinterExceptionHandler(_analysisOptions.propagateLinterExceptions) - .logException)); + LinterExceptionHandler( + propagateExceptions: _analysisOptions.propagateLinterExceptions, + ).logException, + ), + ); } void _computeVerifyErrors(FileState file, CompilationUnit unit) { diff --git a/pkg/analyzer/lib/src/dart/ast/utilities.dart b/pkg/analyzer/lib/src/dart/ast/utilities.dart index 4387e37a8ae..a40e33a8741 100644 --- a/pkg/analyzer/lib/src/dart/ast/utilities.dart +++ b/pkg/analyzer/lib/src/dart/ast/utilities.dart @@ -1308,9 +1308,11 @@ class DeferredLibraryReferenceDetector extends RecursiveAstVisitor { class LinterExceptionHandler { /// Indicates whether linter exceptions should be propagated to the caller (by /// re-throwing them) - final bool propagateLinterExceptions; + final bool propagateExceptions; - LinterExceptionHandler(this.propagateLinterExceptions); + LinterExceptionHandler({ + required this.propagateExceptions, + }); /// A method that can be passed to the `LinterVisitor` constructor to handle /// exceptions that occur during linting. @@ -1332,7 +1334,7 @@ class LinterExceptionHandler { // TODO(39284): should this exception be silent? AnalysisEngine.instance.instrumentationService.logException( SilentException(buffer.toString(), exception, stackTrace)); - if (propagateLinterExceptions) { + if (propagateExceptions) { throw exception; } } diff --git a/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart b/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart index 327af6ec07a..930340ac99c 100644 --- a/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart +++ b/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart @@ -348,10 +348,14 @@ class LibraryAnalyzer { } // Run lints that handle specific node types. - unit.accept(LinterVisitor( + unit.accept( + LinterVisitor( nodeRegistry, - LinterExceptionHandler(_analysisOptions.propagateLinterExceptions) - .logException)); + LinterExceptionHandler( + propagateExceptions: _analysisOptions.propagateLinterExceptions, + ).logException, + ), + ); } void _computeVerifyErrors(FileState file, CompilationUnit unit) { diff --git a/pkg/analyzer/lib/src/lint/linter_visitor.dart b/pkg/analyzer/lib/src/lint/linter_visitor.dart index 0794a4c0de7..424d04abbb5 100644 --- a/pkg/analyzer/lib/src/lint/linter_visitor.dart +++ b/pkg/analyzer/lib/src/lint/linter_visitor.dart @@ -18,8 +18,8 @@ class LinterVisitor extends RecursiveAstVisitor { final LintRuleExceptionHandler exceptionHandler; LinterVisitor(this.registry, [LintRuleExceptionHandler? exceptionHandler]) - : exceptionHandler = - exceptionHandler ?? LinterExceptionHandler(true).logException; + : exceptionHandler = exceptionHandler ?? + LinterExceptionHandler(propagateExceptions: true).logException; @override void visitAdjacentStrings(AdjacentStrings node) {