Skip to content

Commit 686e85d

Browse files
authored
=> Dart 3.0! (#4267)
* dart 3.0 migration * fixed dangling library
1 parent 74fa5ff commit 686e85d

File tree

7 files changed

+13
-35
lines changed

7 files changed

+13
-35
lines changed

analysis_options.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ linter:
3939
# - combinators_ordering
4040
# - close_sinks # https://github.com/dart-lang/linter/issues/268
4141
- comment_references
42+
- dangling_library_doc_comments
4243
- directives_ordering
4344
- discarded_futures
4445
- join_return_with_assignment
@@ -71,6 +72,7 @@ linter:
7172
- throw_in_finally
7273
# - type_annotate_public_apis
7374
- unawaited_futures # pedantic
75+
- unnecessary_breaks
7476
- unnecessary_final
7577
- unnecessary_lambdas
7678
- unnecessary_null_checks

lib/src/ast.dart

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
/// Common AST helpers.
6+
library;
7+
68
import 'package:analyzer/dart/ast/ast.dart';
79
import 'package:analyzer/dart/ast/syntactic_entity.dart';
810
import 'package:analyzer/dart/ast/token.dart';

lib/src/rules/prefer_contains.dart

+8-19
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,6 @@ class _Visitor extends SimpleAstVisitor<void> {
140140
}
141141
}
142142

143-
TokenType _invertedTokenType(TokenType type) {
144-
switch (type) {
145-
case TokenType.LT_EQ:
146-
return TokenType.GT_EQ;
147-
148-
case TokenType.LT:
149-
return TokenType.GT;
150-
151-
case TokenType.GT:
152-
return TokenType.LT;
153-
154-
case TokenType.GT_EQ:
155-
return TokenType.LT_EQ;
156-
157-
default:
158-
return type;
159-
}
160-
}
161-
162143
/// Returns whether [expression] is an invocation of `Iterable.indexOf` or
163144
/// `String.indexOf`, which is not assigned to a value.
164145
bool _isUnassignedIndexOf(Expression expression) {
@@ -193,4 +174,12 @@ class _Visitor extends SimpleAstVisitor<void> {
193174

194175
return true;
195176
}
177+
178+
static TokenType _invertedTokenType(TokenType type) => switch (type) {
179+
TokenType.LT_EQ => TokenType.GT_EQ,
180+
TokenType.LT => TokenType.GT,
181+
TokenType.GT => TokenType.LT,
182+
TokenType.GT_EQ => TokenType.LT_EQ,
183+
_ => type
184+
};
196185
}

lib/src/util/unrelated_types_visitor.dart

-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ abstract class UnrelatedTypesProcessors extends SimpleAstVisitor<void> {
127127
typeArgument.getDisplayString(withNullability: true),
128128
]);
129129
}
130-
break;
131130

132131
case ExpectedArgumentKind.assignableToCollection:
133132
if (!typeSystem.isAssignableTo(argumentType, collectionType)) {
@@ -136,7 +135,6 @@ abstract class UnrelatedTypesProcessors extends SimpleAstVisitor<void> {
136135
collectionType.getDisplayString(withNullability: true),
137136
]);
138137
}
139-
break;
140138

141139
case ExpectedArgumentKind.assignableToIterableOfTypeArgument:
142140
var iterableType =

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repository: https://github.com/dart-lang/linter
99
documentation: https://dart-lang.github.io/linter/lints
1010

1111
environment:
12-
sdk: '>=2.17.0 <3.0.0'
12+
sdk: ^3.0.0-0
1313

1414
dependencies:
1515
analyzer: ^5.10.0

tool/canonical/scorecard.dart

-5
Original file line numberDiff line numberDiff line change
@@ -197,25 +197,20 @@ class LintScore {
197197
case Detail.rule:
198198
sb.write(
199199
' [`$name`](https://dart-lang.github.io/linter/lints/$name.html) |');
200-
break;
201200
case Detail.fix:
202201
var status = unfixableLints.contains(name)
203202
? skip
204203
: (hasFix ? checkMark : consider);
205204
sb.write(' $status |');
206-
break;
207205
case Detail.bulk:
208206
var status = unfixableLints.contains(name)
209207
? skip
210208
: (hasBulkFix ? checkMark : consider);
211209
sb.write(' $status |');
212-
break;
213210
case Detail.status:
214211
sb.write('${!state.isStable ? ' **${state.label}** ' : ""} |');
215-
break;
216212
case Detail.bugs:
217213
sb.write(' ${bugReferences.join(", ")} |');
218-
break;
219214
}
220215
}
221216
return sb.toString();

tool/scorecard.dart

-8
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,21 @@ class LintScore {
151151
case Detail.rule:
152152
sb.write(
153153
' [$name](https://dart-lang.github.io/linter/lints/$name.html) |');
154-
break;
155154
case Detail.linter:
156155
sb.write(' ${since!.sinceLinter} |');
157-
break;
158156
case Detail.sdk:
159157
sb.write(' ${since!.sinceDartSdk} |');
160-
break;
161158
case Detail.fix:
162159
sb.write('${hasFix ? " $bulb" : ""} |');
163-
break;
164160
case Detail.flutterUser:
165161
sb.write('${ruleSets.contains('flutter') ? " $checkMark" : ""} |');
166-
break;
167162
case Detail.flutterRepo:
168163
sb.write(
169164
'${ruleSets.contains('flutter_repo') ? " $checkMark" : ""} |');
170-
break;
171165
case Detail.status:
172166
sb.write('${!state.isStable ? ' **${state.label}** ' : ""} |');
173-
break;
174167
case Detail.bugs:
175168
sb.write(' ${bugReferences.join(", ")} |');
176-
break;
177169
}
178170
}
179171
return sb.toString();

0 commit comments

Comments
 (0)