From 38e5e9bc19b916c8d36e98c551e8fde850468776 Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Wed, 24 Mar 2021 17:35:32 +0000 Subject: [PATCH] [ddc] Update pedantic version to 1.11.0 Apply new lints, cleanup violations, and ignore in `lib/src/js_ast` to avoid adding additional diffs with the version it was forked from. Change-Id: I1def25865bf195120c594223ebdc0f59139e75b7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/192241 Reviewed-by: Mark Zhou Commit-Queue: Nicholas Shahan --- DEPS | 4 ++-- pkg/dev_compiler/analysis_options.yaml | 2 +- pkg/dev_compiler/lib/src/compiler/js_names.dart | 4 ++-- pkg/dev_compiler/lib/src/js_ast/builder.dart | 1 + pkg/dev_compiler/pubspec.yaml | 2 +- .../expression_compiler_e2e_test.dart | 16 ++++++++-------- .../expression_compiler_test.dart | 2 +- .../expression_compiler_worker_test.dart | 2 +- pkg/dev_compiler/test/modular_suite.dart | 2 +- pkg/dev_compiler/test/modular_suite_nnbd.dart | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/DEPS b/DEPS index 7ddc11e9c26..2948ee694b2 100644 --- a/DEPS +++ b/DEPS @@ -130,7 +130,7 @@ vars = { "oauth2_rev": "7cd3284049fe5badbec9f2bea2afc41d14c01057", "package_config_rev": "a84c0d45401f215fbe9384df923a38f4022a3c45", "path_rev": "407ab76187fade41c31e39c745b39661b710106c", - "pedantic_rev": "df177f6ae531426aaf7bbf0121c90dc89d9c57bf", + "pedantic_rev": "66f2f6c27581c7936482e83be80b27be2719901c", "platform_rev": "c20e6fa315e9f8820e51c0ae721f63aff33b8e17", "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93", "pool_rev": "7abe634002a1ba8a0928eded086062f1307ccfae", @@ -613,7 +613,7 @@ deps = { "version": "ebF5aRXKDananlaN4Y8b0bbCNHT1MnkGbWqfpCpiND4C", }, ], - "dep_type": "cipd", + "dep_type": "cipd", }, Var("dart_root") + "/third_party/browsers/chrome": { "packages": [ diff --git a/pkg/dev_compiler/analysis_options.yaml b/pkg/dev_compiler/analysis_options.yaml index 6a33ce2911a..4c72ad82f6e 100644 --- a/pkg/dev_compiler/analysis_options.yaml +++ b/pkg/dev_compiler/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:pedantic/analysis_options.1.9.0.yaml +include: package:pedantic/analysis_options.1.11.0.yaml analyzer: strong-mode: diff --git a/pkg/dev_compiler/lib/src/compiler/js_names.dart b/pkg/dev_compiler/lib/src/compiler/js_names.dart index 81e38998700..3295e0c8c39 100644 --- a/pkg/dev_compiler/lib/src/compiler/js_names.dart +++ b/pkg/dev_compiler/lib/src/compiler/js_names.dart @@ -246,11 +246,11 @@ class _RenameVisitor extends VariableDeclarationVisitor { // If collisions become common we need a better search. // TODO(jmesserly): what's the most readable scheme here? Maybe 1-letter // names in some cases? - candidate = name == 'function' ? 'func' : '${name}\$'; + candidate = name == 'function' ? 'func' : '$name\$'; for (var i = 0; scopes.any((scope) => scope.used.contains(candidate)); i++) { - candidate = '${name}\$$i'; + candidate = '$name\$$i'; } } return candidate; diff --git a/pkg/dev_compiler/lib/src/js_ast/builder.dart b/pkg/dev_compiler/lib/src/js_ast/builder.dart index 42a451127d8..0e0077a094e 100644 --- a/pkg/dev_compiler/lib/src/js_ast/builder.dart +++ b/pkg/dev_compiler/lib/src/js_ast/builder.dart @@ -7,6 +7,7 @@ // ignore_for_file: slash_for_doc_comments, unnecessary_new // ignore_for_file: always_declare_return_types, prefer_single_quotes // ignore_for_file: prefer_collection_literals, omit_local_variable_types +// ignore_for_file: unnecessary_brace_in_string_interps // Utilities for building JS ASTs at runtime. Contains a builder class // and a parser that parses part of the language. diff --git a/pkg/dev_compiler/pubspec.yaml b/pkg/dev_compiler/pubspec.yaml index 746c80017aa..a3a70e5afc2 100644 --- a/pkg/dev_compiler/pubspec.yaml +++ b/pkg/dev_compiler/pubspec.yaml @@ -36,7 +36,7 @@ dev_dependencies: modular_test: path: ../modular_test package_config: any - pedantic: ^1.8.0 + pedantic: ^1.11.0 sourcemap_testing: path: ../sourcemap_testing stack_trace: any diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_test.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_test.dart index bf7b39aaf5f..ebc57c1fdee 100644 --- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_test.dart +++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_test.dart @@ -235,7 +235,7 @@ class TestDriver { /// Initializes a Chrome browser instance, tab connection, and debugger. /// /// Should be called once after creating TestDriver. - void initChrome() async { + Future initChrome() async { // Create a temporary directory for holding Chrome tests. var systemTempDir = Directory.systemTemp; chromeDir = await systemTempDir.createTemp('ddc_eval_test_anchor'); @@ -248,14 +248,14 @@ class TestDriver { var tab = await chrome.chromeConnection .getTab((tab) => !tab.isBackgroundPage && !tab.isChromeExtension); connection = await tab.connect(); - debugger = (await connection).debugger; + debugger = connection.debugger; } /// Must be called when testing a new Dart program. /// /// Depends on SDK artifacts (such as the sound and unsound dart_sdk.js /// files) generated from the 'dartdevc_test' target. - void initSource(SetupCompilerOptions setup, String source) async { + Future initSource(SetupCompilerOptions setup, String source) async { this.setup = setup; this.source = source; testDir = await chromeDir.createTemp('ddc_eval_test'); @@ -340,7 +340,7 @@ class TestDriver { require.config({ paths: { 'dart_sdk': '$dartSdkPath', - '$moduleName': '${outputPath}' + '$moduleName': '$outputPath' }, waitSeconds: 15 }); @@ -385,13 +385,13 @@ class TestDriver { chromeDir?.deleteSync(recursive: true); } - void cleanupTest() async { + Future cleanupTest() async { setup.diagnosticMessages.clear(); setup.errors.clear(); await debugger.disable(); } - void check( + Future check( {String breakpointId, String expression, String expectedError, @@ -417,7 +417,7 @@ class TestDriver { 'Unable to find JS script corresponding to test file $output in ${debugger.scripts}.')) .value; - // Breakpoint at the frst WIP location mapped from its Dart line. + // Breakpoint at the first WIP location mapped from its Dart line. var dartLine = _findBreakpointLine(breakpointId); var location = await _jsLocationFromDartLine(script, dartLine); var bp = await debugger.setBreakpoint(location); @@ -510,7 +510,7 @@ class TestDriver { lines.indexWhere((l) => l.endsWith('// Breakpoint: $breakpointId')); if (lineNumber == -1) { throw StateError( - 'Unable to find breakpoint in ${input} with id: $breakpointId'); + 'Unable to find breakpoint in $input with id: $breakpointId'); } return lineNumber + 1; } diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart index 993d2aacb2f..588797aa0a2 100644 --- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart +++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart @@ -274,7 +274,7 @@ class TestDriver { tempDir.delete(recursive: true); } - void check( + Future check( {Map scope, String expression, String expectedError, diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart index 4903914c223..e5fa0e0676f 100644 --- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart +++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_test.dart @@ -760,7 +760,7 @@ class DDCKernelGenerator { var dartdevc = p.join(p.dirname(dart), 'snapshots', 'dartdevc.dart.snapshot'); - Directory.fromUri(config.outputPath)..createSync(); + Directory.fromUri(config.outputPath).createSync(); // generate test_library3.full.dill var args = [ diff --git a/pkg/dev_compiler/test/modular_suite.dart b/pkg/dev_compiler/test/modular_suite.dart index 79181e5274c..c93b5cb3cb0 100644 --- a/pkg/dev_compiler/test/modular_suite.dart +++ b/pkg/dev_compiler/test/modular_suite.dart @@ -48,7 +48,7 @@ const txtId = DataId('txt'); String _packageConfigEntry(String name, Uri root, {Uri packageRoot, LanguageVersion version}) { var fields = [ - '"name": "${name}"', + '"name": "$name"', '"rootUri": "$root"', if (packageRoot != null) '"packageUri": "$packageRoot"', if (version != null) '"languageVersion": "$version"' diff --git a/pkg/dev_compiler/test/modular_suite_nnbd.dart b/pkg/dev_compiler/test/modular_suite_nnbd.dart index aaf92a3968c..29bd656cc5b 100644 --- a/pkg/dev_compiler/test/modular_suite_nnbd.dart +++ b/pkg/dev_compiler/test/modular_suite_nnbd.dart @@ -48,7 +48,7 @@ const txtId = DataId('txt'); String _packageConfigEntry(String name, Uri root, {Uri packageRoot, LanguageVersion version}) { var fields = [ - '"name": "${name}"', + '"name": "$name"', '"rootUri": "$root"', if (packageRoot != null) '"packageUri": "$packageRoot"', if (version != null) '"languageVersion": "$version"'