Skip to content

Commit 49bc3ff

Browse files
scheglovscheglov
authored
Merge pull request #1125 from scheglov/analyzer-4.4.0
Require analyzer 4.4.0, stop using deprecated APIs.
2 parents 5a14b5e + 4ff7c91 commit 49bc3ff

File tree

4 files changed

+62
-55
lines changed

4 files changed

+62
-55
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
* Remove blank lines after a line comment at the end of a body.
2525

26+
* Require `package:analyzer` version `4.4.0`.
27+
2628
# 2.2.3
2729

2830
* Allow the latest version of `package:analyzer`.

‎lib/src/source_visitor.dart

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,9 @@ class SourceVisitor extends ThrowingAstVisitor {
574574
token(node.catchKeyword);
575575
space();
576576
token(node.leftParenthesis);
577-
visit(node.exceptionParameter);
577+
visit(node.exceptionParameter2);
578578
token(node.comma, after: space);
579-
visit(node.stackTraceParameter);
579+
visit(node.stackTraceParameter2);
580580
token(node.rightParenthesis);
581581
space();
582582
} else {
@@ -585,6 +585,11 @@ class SourceVisitor extends ThrowingAstVisitor {
585585
visit(node.body);
586586
}
587587

588+
@override
589+
visitCatchClauseParameter(CatchClauseParameter node) {
590+
token(node.name);
591+
}
592+
588593
@override
589594
void visitClassDeclaration(ClassDeclaration node) {
590595
visitMetadata(node.metadata);
@@ -593,7 +598,7 @@ class SourceVisitor extends ThrowingAstVisitor {
593598
modifier(node.abstractKeyword);
594599
token(node.classKeyword);
595600
space();
596-
visit(node.name);
601+
token(node.name2);
597602
visit(node.typeParameters);
598603
visit(node.extendsClause);
599604
_visitClauses(node.withClause, node.implementsClause);
@@ -612,7 +617,7 @@ class SourceVisitor extends ThrowingAstVisitor {
612617
modifier(node.abstractKeyword);
613618
token(node.typedefKeyword);
614619
space();
615-
visit(node.name);
620+
token(node.name2);
616621
visit(node.typeParameters);
617622
space();
618623
token(node.equals);
@@ -759,7 +764,7 @@ class SourceVisitor extends ThrowingAstVisitor {
759764
modifier(node.factoryKeyword);
760765
visit(node.returnType);
761766
token(node.period);
762-
visit(node.name);
767+
token(node.name2);
763768

764769
// Make the rule for the ":" span both the preceding parameter list and
765770
// the entire initialization list. This ensures that we split before the
@@ -897,7 +902,7 @@ class SourceVisitor extends ThrowingAstVisitor {
897902
void visitDeclaredIdentifier(DeclaredIdentifier node) {
898903
modifier(node.keyword);
899904
visit(node.type, after: space);
900-
visit(node.identifier);
905+
token(node.name);
901906
}
902907

903908
@override
@@ -976,7 +981,7 @@ class SourceVisitor extends ThrowingAstVisitor {
976981
@override
977982
void visitEnumConstantDeclaration(EnumConstantDeclaration node) {
978983
visitMetadata(node.metadata);
979-
visit(node.name);
984+
token(node.name2);
980985

981986
var arguments = node.arguments;
982987
if (arguments != null) {
@@ -1001,7 +1006,7 @@ class SourceVisitor extends ThrowingAstVisitor {
10011006
builder.nestExpression();
10021007
token(node.enumKeyword);
10031008
space();
1004-
visit(node.name);
1009+
token(node.name2);
10051010
visit(node.typeParameters);
10061011
_visitClauses(node.withClause, node.implementsClause);
10071012
space();
@@ -1054,7 +1059,7 @@ class SourceVisitor extends ThrowingAstVisitor {
10541059
void visitExportDirective(ExportDirective node) {
10551060
_visitDirectiveMetadata(node);
10561061
_simpleStatement(node, () {
1057-
token(node.keyword);
1062+
token(node.exportKeyword);
10581063
space();
10591064
visit(node.uri);
10601065

@@ -1245,9 +1250,9 @@ class SourceVisitor extends ThrowingAstVisitor {
12451250

12461251
// Don't put a space after `extension` if the extension is unnamed. That
12471252
// way, generic unnamed extensions format like `extension<T> on ...`.
1248-
if (node.name != null) {
1253+
if (node.name2 != null) {
12491254
space();
1250-
visit(node.name);
1255+
token(node.name2);
12511256
}
12521257

12531258
visit(node.typeParameters);
@@ -1281,7 +1286,7 @@ class SourceVisitor extends ThrowingAstVisitor {
12811286
visit(node.type, after: split);
12821287
token(node.thisKeyword);
12831288
token(node.period);
1284-
visit(node.identifier);
1289+
token(node.name);
12851290
visit(node.parameters);
12861291
token(node.question);
12871292
_endFormalParameter(node);
@@ -1602,17 +1607,17 @@ class SourceVisitor extends ThrowingAstVisitor {
16021607
// Inlined visitGenericTypeAlias
16031608
_visitGenericTypeAliasHeader(
16041609
node.typedefKeyword,
1605-
node.name,
1610+
node.name2,
16061611
node.typeParameters,
16071612
null,
1608-
(node.returnType ?? node.name).beginToken);
1613+
node.returnType?.beginToken ?? node.name2);
16091614

16101615
space();
16111616

16121617
// Recursively convert function-arguments to Function syntax.
16131618
_insideNewTypedefFix = true;
16141619
_visitGenericFunctionType(
1615-
node.returnType, null, node.name.token, null, node.parameters);
1620+
node.returnType, null, node.name2, null, node.parameters);
16161621
_insideNewTypedefFix = false;
16171622
});
16181623
return;
@@ -1622,7 +1627,7 @@ class SourceVisitor extends ThrowingAstVisitor {
16221627
token(node.typedefKeyword);
16231628
space();
16241629
visit(node.returnType, after: space);
1625-
visit(node.name);
1630+
token(node.name2);
16261631
visit(node.typeParameters);
16271632
visit(node.parameters);
16281633
});
@@ -1637,17 +1642,17 @@ class SourceVisitor extends ThrowingAstVisitor {
16371642
visit(node.returnType, after: space);
16381643
// Try to keep the function's parameters with its name.
16391644
builder.startSpan();
1640-
visit(node.identifier);
1645+
token(node.name);
16411646
_visitParameterSignature(node.typeParameters, node.parameters);
16421647
token(node.question);
16431648
builder.endSpan();
16441649
} else {
16451650
_beginFormalParameter(node);
1646-
_visitGenericFunctionType(node.returnType, null, node.identifier.token,
1651+
_visitGenericFunctionType(node.returnType, null, node.name,
16471652
node.typeParameters, node.parameters);
16481653
token(node.question);
16491654
split();
1650-
visit(node.identifier);
1655+
token(node.name);
16511656
_endFormalParameter(node);
16521657
}
16531658
});
@@ -1664,7 +1669,7 @@ class SourceVisitor extends ThrowingAstVisitor {
16641669
void visitGenericTypeAlias(GenericTypeAlias node) {
16651670
visitNodes(node.metadata, between: newline, after: newline);
16661671
_simpleStatement(node, () {
1667-
_visitGenericTypeAliasHeader(node.typedefKeyword, node.name,
1672+
_visitGenericTypeAliasHeader(node.typedefKeyword, node.name2,
16681673
node.typeParameters, node.equals, null);
16691674

16701675
space();
@@ -1866,7 +1871,7 @@ class SourceVisitor extends ThrowingAstVisitor {
18661871
void visitImportDirective(ImportDirective node) {
18671872
_visitDirectiveMetadata(node);
18681873
_simpleStatement(node, () {
1869-
token(node.keyword);
1874+
token(node.importKeyword);
18701875
space();
18711876
visit(node.uri);
18721877

@@ -2015,7 +2020,7 @@ class SourceVisitor extends ThrowingAstVisitor {
20152020
void visitLibraryDirective(LibraryDirective node) {
20162021
_visitDirectiveMetadata(node);
20172022
_simpleStatement(node, () {
2018-
token(node.keyword);
2023+
token(node.libraryKeyword);
20192024
space();
20202025
visit(node.name);
20212026
});
@@ -2116,7 +2121,7 @@ class SourceVisitor extends ThrowingAstVisitor {
21162121
builder.nestExpression();
21172122
token(node.mixinKeyword);
21182123
space();
2119-
visit(node.name);
2124+
token(node.name2);
21202125
visit(node.typeParameters);
21212126

21222127
// If there is only a single superclass constraint, format it like an
@@ -2198,7 +2203,7 @@ class SourceVisitor extends ThrowingAstVisitor {
21982203
void visitPartDirective(PartDirective node) {
21992204
_visitDirectiveMetadata(node);
22002205
_simpleStatement(node, () {
2201-
token(node.keyword);
2206+
token(node.partKeyword);
22022207
space();
22032208
visit(node.uri);
22042209
});
@@ -2208,7 +2213,7 @@ class SourceVisitor extends ThrowingAstVisitor {
22082213
void visitPartOfDirective(PartOfDirective node) {
22092214
_visitDirectiveMetadata(node);
22102215
_simpleStatement(node, () {
2211-
token(node.keyword);
2216+
token(node.partKeyword);
22122217
space();
22132218
token(node.ofKeyword);
22142219
space();
@@ -2327,17 +2332,17 @@ class SourceVisitor extends ThrowingAstVisitor {
23272332
// without a name. Add "dynamic" in that case.
23282333

23292334
// Ensure comments on the identifier comes before the inserted type.
2330-
token(node.identifier!.token, before: () {
2331-
_writeText('dynamic', node.identifier!.token);
2335+
token(node.name, before: () {
2336+
_writeText('dynamic', node.name!);
23322337
split();
23332338
});
23342339
} else {
23352340
modifier(node.keyword);
23362341
visit(node.type);
23372342

2338-
if (hasType && node.identifier != null) split();
2343+
if (hasType && node.name != null) split();
23392344

2340-
visit(node.identifier);
2345+
token(node.name);
23412346
}
23422347

23432348
_endFormalParameter(node);
@@ -2392,7 +2397,7 @@ class SourceVisitor extends ThrowingAstVisitor {
23922397
visit(node.type, after: split);
23932398
token(node.superKeyword);
23942399
token(node.period);
2395-
visit(node.identifier);
2400+
token(node.name);
23962401
visit(node.parameters);
23972402
token(node.question);
23982403
_endFormalParameter(node);
@@ -2499,7 +2504,7 @@ class SourceVisitor extends ThrowingAstVisitor {
24992504
@override
25002505
void visitTypeParameter(TypeParameter node) {
25012506
visitParameterMetadata(node.metadata, () {
2502-
visit(node.name);
2507+
token(node.name2);
25032508
token(node.extendsKeyword, before: space, after: space);
25042509
visit(node.bound);
25052510
});
@@ -2516,7 +2521,7 @@ class SourceVisitor extends ThrowingAstVisitor {
25162521

25172522
@override
25182523
void visitVariableDeclaration(VariableDeclaration node) {
2519-
visit(node.name);
2524+
token(node.name2);
25202525
if (node.initializer == null) return;
25212526

25222527
// If there are multiple variables being declared, we want to nest the
@@ -2808,7 +2813,7 @@ class SourceVisitor extends ThrowingAstVisitor {
28082813
visit(node.returnType, after: soloSplit);
28092814
modifier(node.propertyKeyword);
28102815
if (node is MethodDeclaration) modifier(node.operatorKeyword);
2811-
visit(node.name);
2816+
token(node.name2);
28122817
builder.endSpan();
28132818

28142819
TypeParameterList? typeParameters;
@@ -3155,7 +3160,7 @@ class SourceVisitor extends ThrowingAstVisitor {
31553160
/// Also used by a fix so there may not be an [equals] token.
31563161
/// If [equals] is `null`, then [equalsPosition] must be a
31573162
/// position to use for the inserted text "=".
3158-
void _visitGenericTypeAliasHeader(Token typedefKeyword, AstNode name,
3163+
void _visitGenericTypeAliasHeader(Token typedefKeyword, Token name,
31593164
AstNode? typeParameters, Token? equals, Token? positionToken) {
31603165
token(typedefKeyword);
31613166
space();
@@ -3165,7 +3170,7 @@ class SourceVisitor extends ThrowingAstVisitor {
31653170
// end up on successive lines with the same indentation.
31663171
builder.startRule();
31673172

3168-
visit(name);
3173+
token(name);
31693174

31703175
visit(typeParameters);
31713176
split();

0 commit comments

Comments
 (0)