Skip to content

Commit aad9e0a

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove forOffset() constructors.
Change-Id: Idc0e19e8e6adb5a9b80efc7d63023693dbc65961 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441362 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 440b068 commit aad9e0a

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3779,11 +3779,6 @@ sealed class FunctionFragmentImpl extends ExecutableFragmentImpl
37793779
/// [offset].
37803780
FunctionFragmentImpl({required this.name, required super.firstTokenOffset});
37813781

3782-
/// Initialize a newly created function element to have no name and the given
3783-
/// [nameOffset]. This is used for function expressions, that have no name.
3784-
FunctionFragmentImpl.forOffset({required super.firstTokenOffset})
3785-
: name = null;
3786-
37873782
@override
37883783
ExecutableFragmentImpl get declaration => this;
37893784
}
@@ -3936,7 +3931,7 @@ class GenericFunctionTypeFragmentImpl extends FragmentImpl
39363931

39373932
/// Initialize a newly created function element to have no name and the given
39383933
/// [nameOffset]. This is used for function expressions, that have no name.
3939-
GenericFunctionTypeFragmentImpl.forOffset({required super.firstTokenOffset});
3934+
GenericFunctionTypeFragmentImpl({required super.firstTokenOffset});
39403935

39413936
@override
39423937
List<Fragment> get children => [...typeParameters, ...parameters];
@@ -6842,9 +6837,6 @@ class LocalFunctionFragmentImpl extends FunctionFragmentImpl
68426837
required super.firstTokenOffset,
68436838
});
68446839

6845-
LocalFunctionFragmentImpl.forOffset({required super.firstTokenOffset})
6846-
: super.forOffset();
6847-
68486840
@override
68496841
bool get _includeNameOffsetInIdentifier {
68506842
return super._includeNameOffsetInIdentifier ||

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,8 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
786786

787787
@override
788788
void visitFunctionExpression(covariant FunctionExpressionImpl node) {
789-
var fragment = LocalFunctionFragmentImpl.forOffset(
789+
var fragment = LocalFunctionFragmentImpl(
790+
name: null,
790791
firstTokenOffset: node.offset,
791792
);
792793

@@ -901,7 +902,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
901902

902903
@override
903904
void visitGenericFunctionType(GenericFunctionType node) {
904-
var fragment = GenericFunctionTypeFragmentImpl.forOffset(
905+
var fragment = GenericFunctionTypeFragmentImpl(
905906
firstTokenOffset: node.offset,
906907
);
907908
_unitElement.encloseElement(fragment);

pkg/analyzer/lib/src/summary2/ast_binary_reader.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,9 +694,7 @@ class AstBinaryReader {
694694
var type = _reader.readRequiredType() as FunctionTypeImpl;
695695
node.type = type;
696696

697-
var fragment = GenericFunctionTypeFragmentImpl.forOffset(
698-
firstTokenOffset: null,
699-
);
697+
var fragment = GenericFunctionTypeFragmentImpl(firstTokenOffset: null);
700698
fragment.parameters =
701699
formalParameters.parameters
702700
.map((parameter) => parameter.declaredFragment!)

pkg/analyzer/lib/src/summary2/bundle_reader.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,7 @@ class ResolutionReader {
17141714
_localElements.length -= typeParameters.length;
17151715

17161716
var fragment =
1717-
GenericFunctionTypeFragmentImpl.forOffset(firstTokenOffset: null)
1717+
GenericFunctionTypeFragmentImpl(firstTokenOffset: null)
17181718
..typeParameters = typeParameters
17191719
..parameters = formalParameters
17201720
..returnType = returnType;

pkg/analyzer/lib/src/summary2/element_builder.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
14141414
node.parameters.accept(this);
14151415
});
14161416

1417-
var aliasedElement = GenericFunctionTypeFragmentImpl.forOffset(
1417+
var aliasedElement = GenericFunctionTypeFragmentImpl(
14181418
firstTokenOffset: null,
14191419
);
14201420
aliasedElement.parameters = holder.parameters;
@@ -1470,9 +1470,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
14701470

14711471
@override
14721472
void visitGenericFunctionType(covariant GenericFunctionTypeImpl node) {
1473-
var fragment = GenericFunctionTypeFragmentImpl.forOffset(
1474-
firstTokenOffset: null,
1475-
);
1473+
var fragment = GenericFunctionTypeFragmentImpl(firstTokenOffset: null);
14761474
_unitElement.encloseElement(fragment);
14771475

14781476
node.declaredFragment = fragment;

0 commit comments

Comments
 (0)