Skip to content

Commit 2242b2b

Browse files
fshcheglovCommit Queue
authored andcommitted
Delete AugmentedExpression and AugmentedInvocation.
The current specification no longer includes the `augmented` expression. It was deprecated in https://dart-review.googlesource.com/c/sdk/+/438560. Change-Id: Icd636cb1511e1d9ffa4dfb61bded1a91599fe09a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438820 Reviewed-by: Paul Berry <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Paul Berry <[email protected]>
1 parent f479da9 commit 2242b2b

29 files changed

+4
-2502
lines changed

pkg/analysis_server/lib/src/computer/computer_highlights.dart

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -719,24 +719,6 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
719719
super.visitAssignedVariablePattern(node);
720720
}
721721

722-
@override
723-
void visitAugmentedExpression(AugmentedExpression node) {
724-
computer._addRegion_token(
725-
node.augmentedKeyword,
726-
HighlightRegionType.KEYWORD,
727-
);
728-
super.visitAugmentedExpression(node);
729-
}
730-
731-
@override
732-
void visitAugmentedInvocation(AugmentedInvocation node) {
733-
computer._addRegion_token(
734-
node.augmentedKeyword,
735-
HighlightRegionType.KEYWORD,
736-
);
737-
super.visitAugmentedInvocation(node);
738-
}
739-
740722
@override
741723
void visitAwaitExpression(AwaitExpression node) {
742724
computer._addRegion_token(

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2675,8 +2675,6 @@ ParserErrorCode.COVARIANT_CONSTRUCTOR:
26752675
are treated the same as members (see `COVARIANT_MEMBER`).
26762676
ParserErrorCode.COVARIANT_MEMBER:
26772677
status: hasFix
2678-
ParserErrorCode.DECLARATION_NAMED_AUGMENTED_INSIDE_AUGMENTATION:
2679-
status: noFix
26802678
ParserErrorCode.DEFAULT_IN_SWITCH_EXPRESSION:
26812679
status: hasFix
26822680
ParserErrorCode.DEFAULT_VALUE_IN_FUNCTION_TYPE:

pkg/analyzer/api.txt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ package:analyzer/analysis_rule/rule_visitor_registry.dart:
126126
addAssertStatement (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
127127
addAssignedVariablePattern (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
128128
addAssignmentExpression (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
129-
addAugmentedExpression (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
130-
addAugmentedInvocation (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
131129
addAwaitExpression (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
132130
addBinaryExpression (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
133131
addBlock (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
@@ -642,8 +640,6 @@ package:analyzer/dart/ast/ast.dart:
642640
visitAssertStatement (method: R? Function(AssertStatement))
643641
visitAssignedVariablePattern (method: R? Function(AssignedVariablePattern))
644642
visitAssignmentExpression (method: R? Function(AssignmentExpression))
645-
visitAugmentedExpression (method: R? Function(AugmentedExpression))
646-
visitAugmentedInvocation (method: R? Function(AugmentedInvocation))
647643
visitAwaitExpression (method: R? Function(AwaitExpression))
648644
visitBinaryExpression (method: R? Function(BinaryExpression))
649645
visitBlock (method: R? Function(Block))
@@ -809,14 +805,6 @@ package:analyzer/dart/ast/ast.dart:
809805
visitWildcardPattern (method: R? Function(WildcardPattern))
810806
visitWithClause (method: R? Function(WithClause))
811807
visitYieldStatement (method: R? Function(YieldStatement))
812-
AugmentedExpression (class extends Object implements Expression):
813-
augmentedKeyword (getter: Token)
814-
fragment (getter: Fragment?, experimental)
815-
AugmentedInvocation (class extends Object implements Expression):
816-
arguments (getter: ArgumentList)
817-
augmentedKeyword (getter: Token)
818-
fragment (getter: ExecutableFragment?, experimental)
819-
typeArguments (getter: TypeArgumentList?)
820808
AwaitExpression (class extends Object implements Expression):
821809
awaitKeyword (getter: Token)
822810
expression (getter: Expression)
@@ -2180,8 +2168,6 @@ package:analyzer/dart/ast/visitor.dart:
21802168
visitAssertStatement (method: R? Function(AssertStatement))
21812169
visitAssignedVariablePattern (method: R? Function(AssignedVariablePattern))
21822170
visitAssignmentExpression (method: R? Function(AssignmentExpression))
2183-
visitAugmentedExpression (method: R? Function(AugmentedExpression))
2184-
visitAugmentedInvocation (method: R? Function(AugmentedInvocation))
21852171
visitAwaitExpression (method: R? Function(AwaitExpression))
21862172
visitBinaryExpression (method: R? Function(BinaryExpression))
21872173
visitBlock (method: R? Function(Block))
@@ -2387,8 +2373,6 @@ package:analyzer/dart/ast/visitor.dart:
23872373
visitAssertStatement (method: R? Function(AssertStatement))
23882374
visitAssignedVariablePattern (method: R? Function(AssignedVariablePattern))
23892375
visitAssignmentExpression (method: R? Function(AssignmentExpression))
2390-
visitAugmentedExpression (method: R? Function(AugmentedExpression))
2391-
visitAugmentedInvocation (method: R? Function(AugmentedInvocation))
23922376
visitAwaitExpression (method: R? Function(AwaitExpression))
23932377
visitBinaryExpression (method: R? Function(BinaryExpression))
23942378
visitBlock (method: R? Function(Block))
@@ -2564,8 +2548,6 @@ package:analyzer/dart/ast/visitor.dart:
25642548
visitAssertStatement (method: R? Function(AssertStatement))
25652549
visitAssignedVariablePattern (method: R? Function(AssignedVariablePattern))
25662550
visitAssignmentExpression (method: R? Function(AssignmentExpression))
2567-
visitAugmentedExpression (method: R? Function(AugmentedExpression))
2568-
visitAugmentedInvocation (method: R? Function(AugmentedInvocation))
25692551
visitAwaitExpression (method: R? Function(AwaitExpression))
25702552
visitBinaryExpression (method: R? Function(BinaryExpression))
25712553
visitBlock (method: R? Function(Block))
@@ -2741,8 +2723,6 @@ package:analyzer/dart/ast/visitor.dart:
27412723
visitAssertStatement (method: R? Function(AssertStatement))
27422724
visitAssignedVariablePattern (method: R? Function(AssignedVariablePattern))
27432725
visitAssignmentExpression (method: R? Function(AssignmentExpression))
2744-
visitAugmentedExpression (method: R? Function(AugmentedExpression))
2745-
visitAugmentedInvocation (method: R? Function(AugmentedInvocation))
27462726
visitAwaitExpression (method: R? Function(AwaitExpression))
27472727
visitBinaryExpression (method: R? Function(BinaryExpression))
27482728
visitBlock (method: R? Function(Block))
@@ -2919,8 +2899,6 @@ package:analyzer/dart/ast/visitor.dart:
29192899
visitAssertStatement (method: T? Function(AssertStatement))
29202900
visitAssignedVariablePattern (method: T? Function(AssignedVariablePattern))
29212901
visitAssignmentExpression (method: T? Function(AssignmentExpression))
2922-
visitAugmentedExpression (method: T? Function(AugmentedExpression))
2923-
visitAugmentedInvocation (method: T? Function(AugmentedInvocation))
29242902
visitAwaitExpression (method: T? Function(AwaitExpression))
29252903
visitBinaryExpression (method: T? Function(BinaryExpression))
29262904
visitBlock (method: T? Function(Block))
@@ -3096,8 +3074,6 @@ package:analyzer/dart/ast/visitor.dart:
30963074
visitAssertStatement (method: R? Function(AssertStatement))
30973075
visitAssignedVariablePattern (method: R? Function(AssignedVariablePattern))
30983076
visitAssignmentExpression (method: R? Function(AssignmentExpression))
3099-
visitAugmentedExpression (method: R? Function(AugmentedExpression))
3100-
visitAugmentedInvocation (method: R? Function(AugmentedInvocation))
31013077
visitAwaitExpression (method: R? Function(AwaitExpression))
31023078
visitBinaryExpression (method: R? Function(BinaryExpression))
31033079
visitBlock (method: R? Function(Block))

pkg/analyzer/lib/analysis_rule/rule_visitor_registry.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ abstract class RuleVisitorRegistry {
3333

3434
void addAssignmentExpression(AbstractAnalysisRule rule, AstVisitor visitor);
3535

36-
void addAugmentedExpression(AbstractAnalysisRule rule, AstVisitor visitor);
37-
38-
void addAugmentedInvocation(AbstractAnalysisRule rule, AstVisitor visitor);
39-
4036
void addAwaitExpression(AbstractAnalysisRule rule, AstVisitor visitor);
4137

4238
void addBinaryExpression(AbstractAnalysisRule rule, AstVisitor visitor);

pkg/analyzer/lib/dart/ast/ast.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ export 'package:analyzer/src/dart/ast/ast.dart'
5050
AssignmentExpression,
5151
AstNode,
5252
AstVisitor,
53-
AugmentedExpression,
54-
AugmentedInvocation,
5553
AwaitExpression,
5654
BinaryExpression,
5755
Block,

pkg/analyzer/lib/dart/ast/visitor.dart

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,6 @@ class GeneralizingAstVisitor<R> implements AstVisitor<R> {
159159
R? visitAssignmentExpression(AssignmentExpression node) =>
160160
visitExpression(node);
161161

162-
@override
163-
R? visitAugmentedExpression(AugmentedExpression node) =>
164-
visitExpression(node);
165-
166-
@override
167-
R? visitAugmentedInvocation(AugmentedInvocation node) =>
168-
visitExpression(node);
169-
170162
@override
171163
R? visitAwaitExpression(AwaitExpression node) => visitExpression(node);
172164

@@ -862,18 +854,6 @@ class RecursiveAstVisitor<R> implements AstVisitor<R> {
862854
return null;
863855
}
864856

865-
@override
866-
R? visitAugmentedExpression(AugmentedExpression node) {
867-
node.visitChildren(this);
868-
return null;
869-
}
870-
871-
@override
872-
R? visitAugmentedInvocation(AugmentedInvocation node) {
873-
node.visitChildren(this);
874-
return null;
875-
}
876-
877857
@override
878858
R? visitAwaitExpression(AwaitExpression node) {
879859
node.visitChildren(this);
@@ -1909,12 +1889,6 @@ class SimpleAstVisitor<R> implements AstVisitor<R> {
19091889
@override
19101890
R? visitAssignmentExpression(AssignmentExpression node) => null;
19111891

1912-
@override
1913-
R? visitAugmentedExpression(AugmentedExpression node) => null;
1914-
1915-
@override
1916-
R? visitAugmentedInvocation(AugmentedInvocation node) => null;
1917-
19181892
@override
19191893
R? visitAwaitExpression(AwaitExpression node) => null;
19201894

@@ -2462,12 +2436,6 @@ class ThrowingAstVisitor<R> implements AstVisitor<R> {
24622436
@override
24632437
R? visitAssignmentExpression(AssignmentExpression node) => _throw(node);
24642438

2465-
@override
2466-
R? visitAugmentedExpression(AugmentedExpression node) => _throw(node);
2467-
2468-
@override
2469-
R? visitAugmentedInvocation(AugmentedInvocation node) => _throw(node);
2470-
24712439
@override
24722440
R? visitAwaitExpression(AwaitExpression node) => _throw(node);
24732441

@@ -3078,22 +3046,6 @@ class TimedAstVisitor<T> implements AstVisitor<T> {
30783046
return result;
30793047
}
30803048

3081-
@override
3082-
T? visitAugmentedExpression(AugmentedExpression node) {
3083-
stopwatch.start();
3084-
T? result = _baseVisitor.visitAugmentedExpression(node);
3085-
stopwatch.stop();
3086-
return result;
3087-
}
3088-
3089-
@override
3090-
T? visitAugmentedInvocation(AugmentedInvocation node) {
3091-
stopwatch.start();
3092-
T? result = _baseVisitor.visitAugmentedInvocation(node);
3093-
stopwatch.stop();
3094-
return result;
3095-
}
3096-
30973049
@override
30983050
T? visitAwaitExpression(AwaitExpression node) {
30993051
stopwatch.start();
@@ -4465,12 +4417,6 @@ class UnifyingAstVisitor<R> implements AstVisitor<R> {
44654417
@override
44664418
R? visitAssignmentExpression(AssignmentExpression node) => visitNode(node);
44674419

4468-
@override
4469-
R? visitAugmentedExpression(AugmentedExpression node) => visitNode(node);
4470-
4471-
@override
4472-
R? visitAugmentedInvocation(AugmentedInvocation node) => visitNode(node);
4473-
44744420
@override
44754421
R? visitAwaitExpression(AwaitExpression node) => visitNode(node);
44764422

0 commit comments

Comments
 (0)