Skip to content

Commit 3a8ff10

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

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
10121012
_labelScope,
10131013
labelNameNode.name,
10141014
unlabeled,
1015-
labelNameNode.staticElement as LabelElement,
1015+
labelNameNode.element as LabelElement2,
10161016
);
10171017
}
10181018
unlabeled.accept(this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class LabelScope {
9393
final String _label;
9494

9595
/// The element to which the label resolves.
96-
final LabelElement element;
96+
final LabelElement2 element;
9797

9898
/// The AST node to which the label resolves.
9999
final AstNode node;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5296,7 +5296,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
52965296
for (var member in node.members) {
52975297
for (var label in member.labels) {
52985298
var labelName = label.label;
5299-
var labelElement = labelName.staticElement as LabelElement;
5299+
var labelElement = labelName.element as LabelElement2;
53005300
_labelScope =
53015301
LabelScope(_labelScope, labelName.name, member, labelElement);
53025302
}
@@ -5366,7 +5366,7 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
53665366
for (var label in labels) {
53675367
var labelNameNode = label.label;
53685368
var labelName = labelNameNode.name;
5369-
var labelElement = labelNameNode.staticElement as LabelElement;
5369+
var labelElement = labelNameNode.element as LabelElement2;
53705370
_labelScope = LabelScope(_labelScope, labelName, node, labelElement);
53715371
}
53725372
return outerScope;
@@ -5409,9 +5409,9 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
54095409
return null;
54105410
}
54115411
// The target has been found.
5412-
labelNode.staticElement = definingScope.element;
5413-
ExecutableElement? labelContainer =
5414-
definingScope.element.thisOrAncestorOfType();
5412+
labelNode.element = definingScope.element;
5413+
var labelContainer =
5414+
definingScope.element.firstFragment.enclosingFragment;
54155415
if (_enclosingClosure != null &&
54165416
!identical(labelContainer, _enclosingClosure)) {
54175417
errorReporter.atNode(

0 commit comments

Comments
 (0)