Skip to content

Commit 44008c4

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove ConstLocalVariableFragmentImpl, use LocalVariableFragmentImpl.
Change-Id: Ieab58cadbffbc5fea60f78f5f07a08662cf69d87 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438600 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent c3e7170 commit 44008c4

File tree

3 files changed

+5
-24
lines changed

3 files changed

+5
-24
lines changed

pkg/analyzer/lib/src/dart/element/element.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -728,17 +728,6 @@ class ConstantInitializerImpl implements ConstantInitializer {
728728
}
729729
}
730730

731-
/// A `LocalVariableElement` for a local 'const' variable that has an
732-
/// initializer.
733-
class ConstLocalVariableFragmentImpl extends LocalVariableFragmentImpl {
734-
/// Initialize a newly created local variable element to have the given [name]
735-
/// and [offset].
736-
ConstLocalVariableFragmentImpl({
737-
required super.name2,
738-
required super.nameOffset,
739-
});
740-
}
741-
742731
class ConstructorElementImpl extends ExecutableElementImpl
743732
with
744733
FragmentedExecutableElementMixin<ConstructorFragmentImpl>,

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,18 +1529,10 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
15291529
variable as VariableDeclarationImpl;
15301530
var nameToken = variable.name;
15311531

1532-
LocalVariableFragmentImpl fragment;
1533-
if (isConst && variable.initializer != null) {
1534-
fragment = ConstLocalVariableFragmentImpl(
1535-
name2: _getFragmentName(nameToken),
1536-
nameOffset: nameToken.offset,
1537-
);
1538-
} else {
1539-
fragment = LocalVariableFragmentImpl(
1540-
name2: _getFragmentName(nameToken),
1541-
nameOffset: nameToken.offset,
1542-
);
1543-
}
1532+
var fragment = LocalVariableFragmentImpl(
1533+
name2: _getFragmentName(nameToken),
1534+
nameOffset: nameToken.offset,
1535+
);
15441536
variable.declaredFragment = fragment;
15451537
_elementHolder.enclose(fragment);
15461538
_define(fragment.element);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class VariableDeclarationResolver {
7777
// Initializers of top-level variables and fields are already included
7878
// into elements during linking.
7979
if (element is LocalVariableElementImpl && element.isConst) {
80-
var fragment = element.firstFragment as ConstLocalVariableFragmentImpl;
80+
var fragment = element.firstFragment;
8181
fragment.constantInitializer = initializer;
8282
}
8383

0 commit comments

Comments
 (0)