Elements. Migrate PatternVariableDeclarationImpl.elements
Change-Id: I0b7cafe4d1def187bbebdb6d694fab56a9d24a7d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411441
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart
index 08836e1..a89380a 100644
--- a/pkg/analyzer/lib/src/dart/ast/ast.dart
+++ b/pkg/analyzer/lib/src/dart/ast/ast.dart
@@ -14170,7 +14170,7 @@
TypeImpl? patternTypeSchema;
/// Variables declared in [pattern].
- late final List<BindPatternVariableElementImpl> elements;
+ late final List<BindPatternVariableElementImpl2> elements;
PatternVariableDeclarationImpl({
required this.keyword,
diff --git a/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
index 164b36f..f65240f 100644
--- a/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
@@ -1003,7 +1003,7 @@
covariant PatternVariableDeclarationImpl node,
) {
for (var variable in node.elements) {
- assignedVariables.declare(variable.element);
+ assignedVariables.declare(variable);
}
super.visitPatternVariableDeclaration(node);
}
diff --git a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
index 4b174c04..ca1370b 100644
--- a/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart
@@ -1165,7 +1165,6 @@
var variablesMap = _patternVariables.casePatternFinish();
node.elements = variablesMap.values
.whereType<BindPatternVariableElementImpl2>()
- .map((e) => e.asElement)
.toList();
}
diff --git a/pkg/analyzer/lib/src/dart/resolver/scope.dart b/pkg/analyzer/lib/src/dart/resolver/scope.dart
index fd3f5e2..1584b05 100644
--- a/pkg/analyzer/lib/src/dart/resolver/scope.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/scope.dart
@@ -31,7 +31,7 @@
}
if (statement is PatternVariableDeclarationStatementImpl) {
for (var variable in statement.declaration.elements) {
- yield variable.asElement2;
+ yield variable;
}
} else if (statement is VariableDeclarationStatement) {
NodeList<VariableDeclaration> variables = statement.variables.variables;
diff --git a/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart b/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
index f550a8d..c075995 100644
--- a/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
+++ b/pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
@@ -103,7 +103,7 @@
} else if (statement is PatternVariableDeclarationStatementImpl) {
for (var variable in statement.declaration.elements) {
_checkDuplicateIdentifier(definedNames, variable.node.name,
- element: variable);
+ element: variable.asElement);
}
}
}
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
index aac4014..f05a658 100644
--- a/pkg/analyzer/lib/src/generated/error_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -1326,7 +1326,7 @@
) {
super.visitPatternVariableDeclarationStatement(node);
for (var variable in node.declaration.elements) {
- _hiddenElements?.declare(variable.asElement2);
+ _hiddenElements?.declare(variable);
}
}
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index cf551f6..0c315b4 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -5186,7 +5186,7 @@
covariant PatternVariableDeclarationImpl node,
) {
for (var variable in node.elements) {
- _define(variable.asElement2);
+ _define(variable);
}
super.visitPatternVariableDeclaration(node);
