Skip to content

Commit c604aa2

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate PatternVariableDeclarationImpl.elements
Change-Id: I0b7cafe4d1def187bbebdb6d694fab56a9d24a7d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411441 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 3c792ec commit c604aa2

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14170,7 +14170,7 @@ final class PatternVariableDeclarationImpl extends AnnotatedNodeImpl
1417014170
TypeImpl? patternTypeSchema;
1417114171

1417214172
/// Variables declared in [pattern].
14173-
late final List<BindPatternVariableElementImpl> elements;
14173+
late final List<BindPatternVariableElementImpl2> elements;
1417414174

1417514175
PatternVariableDeclarationImpl({
1417614176
required this.keyword,

pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ class _AssignedVariablesVisitor extends RecursiveAstVisitor<void> {
10031003
covariant PatternVariableDeclarationImpl node,
10041004
) {
10051005
for (var variable in node.elements) {
1006-
assignedVariables.declare(variable.element);
1006+
assignedVariables.declare(variable);
10071007
}
10081008
super.visitPatternVariableDeclaration(node);
10091009
}

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,6 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
11651165
var variablesMap = _patternVariables.casePatternFinish();
11661166
node.elements = variablesMap.values
11671167
.whereType<BindPatternVariableElementImpl2>()
1168-
.map((e) => e.asElement)
11691168
.toList();
11701169
}
11711170

pkg/analyzer/lib/src/dart/resolver/scope.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class BlockScope {
3131
}
3232
if (statement is PatternVariableDeclarationStatementImpl) {
3333
for (var variable in statement.declaration.elements) {
34-
yield variable.asElement2;
34+
yield variable;
3535
}
3636
} else if (statement is VariableDeclarationStatement) {
3737
NodeList<VariableDeclaration> variables = statement.variables.variables;

pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class DuplicateDefinitionVerifier {
103103
} else if (statement is PatternVariableDeclarationStatementImpl) {
104104
for (var variable in statement.declaration.elements) {
105105
_checkDuplicateIdentifier(definedNames, variable.node.name,
106-
element: variable);
106+
element: variable.asElement);
107107
}
108108
}
109109
}

pkg/analyzer/lib/src/generated/error_verifier.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
13261326
) {
13271327
super.visitPatternVariableDeclarationStatement(node);
13281328
for (var variable in node.declaration.elements) {
1329-
_hiddenElements?.declare(variable.asElement2);
1329+
_hiddenElements?.declare(variable);
13301330
}
13311331
}
13321332

pkg/analyzer/lib/src/generated/resolver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5186,7 +5186,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
51865186
covariant PatternVariableDeclarationImpl node,
51875187
) {
51885188
for (var variable in node.elements) {
5189-
_define(variable.asElement2);
5189+
_define(variable);
51905190
}
51915191

51925192
super.visitPatternVariableDeclaration(node);

0 commit comments

Comments
 (0)