Skip to content

Commit 5072ac8

Browse files
srawlinsCommit Queue
authored andcommitted
linter: Bump language version to 3.9
Change-Id: I4af051894d8aeabbb68ce086b740c212364adb75 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447380 Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 1b212e6 commit 5072ac8

Some content is hidden

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

43 files changed

+226
-234
lines changed

pkg/linter/analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ linter:
6060
- unreachable_from_main
6161
- use_if_null_to_convert_nulls_to_bools
6262
- use_late_for_private_fields_and_variables
63+
- use_null_aware_elements
6364
- use_setters_to_change_properties
6465
- use_string_buffers
6566
- use_to_and_as_if_applicable

pkg/linter/lib/src/extensions.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,9 @@ extension ExpressionExtension on Expression {
377377
if (enclosingElement is! InterfaceElement) return false;
378378

379379
var superTypes = enclosingElement.allSupertypes;
380-
var superMembers =
381-
element is MethodElement
382-
? superTypes.map((t) => t.getMethod(elementName))
383-
: superTypes.map((t) => t.getGetter(elementName));
380+
var superMembers = element is MethodElement
381+
? superTypes.map((t) => t.getMethod(elementName))
382+
: superTypes.map((t) => t.getGetter(elementName));
384383
return superMembers.any((e) => e.hasAwaitNotRequired);
385384
}
386385
}

pkg/linter/lib/src/rules/always_put_control_body_on_new_line.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ class _Visitor extends SimpleAstVisitor<void> {
7070
if (node == null || node is Block && node.statements.isEmpty) return;
7171

7272
var unit = node.root as CompilationUnit;
73-
var offsetFirstStatement =
74-
node is Block ? node.statements.first.offset : node.offset;
73+
var offsetFirstStatement = node is Block
74+
? node.statements.first.offset
75+
: node.offset;
7576
var lineInfo = unit.lineInfo;
7677
if (lineInfo.getLocation(controlEnd).lineNumber ==
7778
lineInfo.getLocation(offsetFirstStatement).lineNumber) {

pkg/linter/lib/src/rules/analyzer_element_model_tracking.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,10 @@ class _Visitor extends SimpleAstVisitor<void> {
6161
var element = node.declaredFragment!.element;
6262
if (element.isElementClass) {
6363
for (var member in node.members) {
64-
var trackingAnnotations =
65-
member.metadata
66-
.map((node) => node.asTrackingAnnotation)
67-
.nonNulls
68-
.toList();
64+
var trackingAnnotations = member.metadata
65+
.map((node) => node.asTrackingAnnotation)
66+
.nonNulls
67+
.toList();
6968

7069
switch (member) {
7170
case ConstructorDeclaration():

pkg/linter/lib/src/rules/avoid_redundant_argument_values.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@ class _Visitor extends SimpleAstVisitor<void> {
142142
);
143143
} else {
144144
// Count which positional argument we're at.
145-
var positionalCount =
146-
arguments.take(i + 1).where((a) => a is! NamedExpression).length;
145+
var positionalCount = arguments
146+
.take(i + 1)
147+
.where((a) => a is! NamedExpression)
148+
.length;
147149
var positionalIndex = positionalCount - 1;
148150
if (positionalIndex < parameters.length) {
149151
if (parameters[positionalIndex].isPositional) {

pkg/linter/lib/src/rules/avoid_renaming_method_parameters.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ class _Visitor extends SimpleAstVisitor<void> {
8585
} else {
8686
if (!node.isAugmentation) return;
8787

88-
parentParameters =
89-
previousFragment.formalParameters.map((p) => p.element).positional;
88+
parentParameters = previousFragment.formalParameters
89+
.map((p) => p.element)
90+
.positional;
9091
}
9192

9293
var parameters = nodeParams.parameters.where((p) => !p.isNamed).toList();

pkg/linter/lib/src/rules/avoid_shadowing_type_parameters.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,9 @@ class _Visitor extends SimpleAstVisitor<void> {
120120
return;
121121
}
122122

123-
var ancestorTypeParameterNames =
124-
ancestorTypeParameters.typeParameters
125-
.map((tp) => tp.name.lexeme)
126-
.toSet();
123+
var ancestorTypeParameterNames = ancestorTypeParameters.typeParameters
124+
.map((tp) => tp.name.lexeme)
125+
.toSet();
127126

128127
for (var parameter in typeParameters.typeParameters) {
129128
var lexeme = parameter.name.lexeme;

pkg/linter/lib/src/rules/avoid_type_to_string.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@ class _Visitor extends SimpleAstVisitor<void> {
115115
void _validateArgument(Expression expression) {
116116
if (expression is PropertyAccess) {
117117
var expressionType = expression.realTarget.staticType;
118-
var targetType =
119-
(expressionType is InterfaceType) ? expressionType : thisType;
118+
var targetType = (expressionType is InterfaceType)
119+
? expressionType
120+
: thisType;
120121
_reportIfToStringOnCoreTypeClass(targetType, expression.propertyName);
121122
} else if (expression is PrefixedIdentifier) {
122123
var prefixType = expression.prefix.staticType;

pkg/linter/lib/src/rules/avoid_unnecessary_containers.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class _Visitor extends SimpleAstVisitor<void> {
4646
if (parent is NamedExpression && parent.name.label.name == 'child') {
4747
var args = parent.thisOrAncestorOfType<ArgumentList>();
4848
if (args?.arguments.length == 1) {
49-
var parentCreation =
50-
parent.thisOrAncestorOfType<InstanceCreationExpression>();
49+
var parentCreation = parent
50+
.thisOrAncestorOfType<InstanceCreationExpression>();
5151
if (parentCreation != null) {
5252
if (isExactWidgetTypeContainer(parentCreation.staticType)) {
5353
rule.reportAtNode(parentCreation.constructorName);

pkg/linter/lib/src/rules/avoid_unused_constructor_parameters.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,14 @@ class _ConstructorVisitor extends RecursiveAstVisitor<void> {
4141
final Set<FormalParameter> unusedParameters;
4242

4343
_ConstructorVisitor(this.element)
44-
: unusedParameters =
45-
element.parameters.parameters.where((p) {
46-
var element = p.declaredFragment?.element;
47-
return element != null &&
48-
element is! FieldFormalParameterElement &&
49-
element is! SuperFormalParameterElement &&
50-
!element.metadata.hasDeprecated &&
51-
!(element.name ?? '').isJustUnderscores;
52-
}).toSet();
44+
: unusedParameters = element.parameters.parameters.where((p) {
45+
var element = p.declaredFragment?.element;
46+
return element != null &&
47+
element is! FieldFormalParameterElement &&
48+
element is! SuperFormalParameterElement &&
49+
!element.metadata.hasDeprecated &&
50+
!(element.name ?? '').isJustUnderscores;
51+
}).toSet();
5352

5453
@override
5554
void visitSimpleIdentifier(SimpleIdentifier node) {

0 commit comments

Comments
 (0)