From ba805d3c6354bc44ee1b4cf0251aa464a7404087 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 18 Jul 2022 17:27:53 +0000 Subject: [PATCH] [pkg] use package:lints for pkg/_js_interop_checks, pkg/js_runtime Change-Id: I3bf78a773d431b21bd2f5cecaf6271899b73da70 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/250783 Reviewed-by: Nicholas Shahan Commit-Queue: Devon Carew --- pkg/_js_interop_checks/analysis_options.yaml | 1 + pkg/_js_interop_checks/lib/js_interop_checks.dart | 4 ++-- pkg/_js_interop_checks/lib/src/js_interop.dart | 4 ++-- .../lib/src/transformations/js_util_optimizer.dart | 2 +- .../lib/src/transformations/js_util_wasm_optimizer.dart | 2 +- pkg/_js_interop_checks/pubspec.yaml | 4 ++++ pkg/js_runtime/analysis_options.yaml | 1 + pkg/js_runtime/pubspec.yaml | 1 + 8 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 pkg/_js_interop_checks/analysis_options.yaml create mode 100644 pkg/js_runtime/analysis_options.yaml diff --git a/pkg/_js_interop_checks/analysis_options.yaml b/pkg/_js_interop_checks/analysis_options.yaml new file mode 100644 index 00000000000..c36c2c5d39f --- /dev/null +++ b/pkg/_js_interop_checks/analysis_options.yaml @@ -0,0 +1 @@ +include: package:lints/core.yaml diff --git a/pkg/_js_interop_checks/lib/js_interop_checks.dart b/pkg/_js_interop_checks/lib/js_interop_checks.dart index 9638d1efac7..b9a73eb2ecb 100644 --- a/pkg/_js_interop_checks/lib/js_interop_checks.dart +++ b/pkg/_js_interop_checks/lib/js_interop_checks.dart @@ -262,7 +262,7 @@ class JsInteropChecks extends RecursiveVisitor { if (isAnonymousFactory) { // ignore: unnecessary_null_comparison if (procedure.function != null && - !procedure.function.positionalParameters.isEmpty) { + procedure.function.positionalParameters.isNotEmpty) { var firstPositionalParam = procedure.function.positionalParameters[0]; _diagnosticsReporter.report( messageJsInteropAnonymousFactoryPositionalParameters, @@ -339,7 +339,7 @@ class JsInteropChecks extends RecursiveVisitor { /// Reports an error if [functionNode] has named parameters. void _checkNoNamedParameters(FunctionNode functionNode) { // ignore: unnecessary_null_comparison - if (functionNode != null && !functionNode.namedParameters.isEmpty) { + if (functionNode != null && functionNode.namedParameters.isNotEmpty) { var firstNamedParam = functionNode.namedParameters[0]; _diagnosticsReporter.report( messageJsInteropNamedParameters, diff --git a/pkg/_js_interop_checks/lib/src/js_interop.dart b/pkg/_js_interop_checks/lib/src/js_interop.dart index 29e852c44e5..079d0beb8b4 100644 --- a/pkg/_js_interop_checks/lib/src/js_interop.dart +++ b/pkg/_js_interop_checks/lib/src/js_interop.dart @@ -35,7 +35,7 @@ String getJSName(Annotatable a) { for (var annotation in a.annotations) { if (_isPublicJSAnnotation(annotation)) { var jsClasses = _stringAnnotationValues(annotation); - if (jsClasses.length > 0) { + if (jsClasses.isNotEmpty) { jsClass = jsClasses[0]; } } @@ -144,7 +144,7 @@ List _stringAnnotationValues(Expression node) { } } else if (node is ConstructorInvocation) { var argLength = node.arguments.positional.length; - if (argLength > 1 || node.arguments.named.length > 0) { + if (argLength > 1 || node.arguments.named.isNotEmpty) { throw new ArgumentError('Method expects annotation with at most one ' 'positional argument: $node.'); } else if (argLength == 1) { diff --git a/pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart b/pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart index 520509970c6..bea8ac4966f 100644 --- a/pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart +++ b/pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart @@ -101,7 +101,7 @@ class JsUtilOptimizer extends Transformer { @override visitProcedure(Procedure node) { _staticTypeContext.enterMember(node); - var transformedBody; + ReturnStatement? transformedBody; if (node.isExternal && node.isExtensionMember) { var index = _extensionMemberIndex ??= _createExtensionMembersIndex(node.enclosingLibrary); diff --git a/pkg/_js_interop_checks/lib/src/transformations/js_util_wasm_optimizer.dart b/pkg/_js_interop_checks/lib/src/transformations/js_util_wasm_optimizer.dart index 3cb0bdc8d9e..89e3b5a92b2 100644 --- a/pkg/_js_interop_checks/lib/src/transformations/js_util_wasm_optimizer.dart +++ b/pkg/_js_interop_checks/lib/src/transformations/js_util_wasm_optimizer.dart @@ -424,7 +424,7 @@ class JsUtilWasmOptimizer extends Transformer { ReturnStatement _getExternalExtensionMethodBody(Procedure node) { final parameters = node.function.positionalParameters; - assert(parameters.length > 0); + assert(parameters.isNotEmpty); return _getExternalMethodBody(node, VariableGet(parameters.first), _getExtensionMemberName(node), parameters.sublist(1)); } diff --git a/pkg/_js_interop_checks/pubspec.yaml b/pkg/_js_interop_checks/pubspec.yaml index 9be1352fc04..786fd8d1465 100644 --- a/pkg/_js_interop_checks/pubspec.yaml +++ b/pkg/_js_interop_checks/pubspec.yaml @@ -9,3 +9,7 @@ environment: dependencies: _fe_analyzer_shared: any kernel: any + +# Use 'any' constraints here; we get our versions from the DEPS file. +dev_dependencies: + lints: any diff --git a/pkg/js_runtime/analysis_options.yaml b/pkg/js_runtime/analysis_options.yaml new file mode 100644 index 00000000000..c36c2c5d39f --- /dev/null +++ b/pkg/js_runtime/analysis_options.yaml @@ -0,0 +1 @@ +include: package:lints/core.yaml diff --git a/pkg/js_runtime/pubspec.yaml b/pkg/js_runtime/pubspec.yaml index a452bc99324..fe9036aa0f3 100644 --- a/pkg/js_runtime/pubspec.yaml +++ b/pkg/js_runtime/pubspec.yaml @@ -9,3 +9,4 @@ environment: dev_dependencies: _fe_analyzer_shared: any expect: any + lints: any