Skip to content

Commit 6e5df68

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Simplify _EnclosingContext.
Specifically, remove methods that do nothing. And remove formal parameters that are not used. Change-Id: I742199de5c5b0d5274c807d516afa6b747971fc3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441982 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent 1bf097e commit 6e5df68

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

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

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
763763
var _partDirectiveIndex = 0;
764764

765765
_EnclosingContext _enclosingContext;
766-
int _nextUnnamedId = 0;
767766

768767
FragmentBuilder({
769768
required LibraryBuilder libraryBuilder,
@@ -1259,7 +1258,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
12591258
parameterKind: node.kind,
12601259
);
12611260
_linker.elementNodes[fragment] = node;
1262-
_enclosingContext.addParameter(null, fragment);
1261+
_enclosingContext.addParameter(fragment);
12631262

12641263
if (node.parent case DefaultFormalParameterImpl parent) {
12651264
fragment.constantInitializer = parent.defaultValue;
@@ -1297,7 +1296,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
12971296
@override
12981297
void visitFunctionDeclaration(covariant FunctionDeclarationImpl node) {
12991298
var nameToken = node.name;
1300-
var name = nameToken.lexeme;
13011299
var name2 = _getFragmentName(nameToken);
13021300

13031301
var functionExpression = node.functionExpression;
@@ -1337,8 +1335,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
13371335
fragment.isStatic = true;
13381336
executableFragment = fragment;
13391337

1340-
_enclosingContext.addFunction(name, fragment);
1341-
13421338
_libraryBuilder.addTopFragment(_unitElement, fragment);
13431339
}
13441340

@@ -1407,7 +1403,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
14071403
parameterKind: node.kind,
14081404
);
14091405
_linker.elementNodes[fragment] = node;
1410-
_enclosingContext.addParameter(null, fragment);
1406+
_enclosingContext.addParameter(fragment);
14111407

14121408
if (node.parent case DefaultFormalParameterImpl parent) {
14131409
fragment.constantInitializer = parent.defaultValue;
@@ -1666,7 +1662,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
16661662
parameterKind: node.kind,
16671663
);
16681664
_linker.elementNodes[fragment] = node;
1669-
_enclosingContext.addParameter(null, fragment);
1665+
_enclosingContext.addParameter(fragment);
16701666

16711667
if (_enclosingContext.hasDefaultFormalParameters) {
16721668
if (node.parent case DefaultFormalParameterImpl parent) {
@@ -1696,7 +1692,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
16961692
parameterKind: node.kind,
16971693
);
16981694
_linker.elementNodes[fragment] = node;
1699-
_enclosingContext.addParameter(null, fragment);
1695+
_enclosingContext.addParameter(fragment);
17001696

17011697
if (node.parent case DefaultFormalParameterImpl parent) {
17021698
fragment.constantInitializer = parent.defaultValue;
@@ -1755,9 +1751,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
17551751
fragment.hasImplicitType = true;
17561752
}
17571753

1758-
var refName = fragment.name ?? '${_nextUnnamedId++}';
1759-
_enclosingContext.addTopLevelVariable(refName, fragment);
1760-
17611754
_libraryBuilder.addTopFragment(_unitElement, fragment);
17621755

17631756
_linker.elementNodes[fragment] = variable;
@@ -1775,7 +1768,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
17751768
@override
17761769
void visitTypeParameter(covariant TypeParameterImpl node) {
17771770
var nameToken = node.name;
1778-
var name = nameToken.lexeme;
17791771

17801772
var fragment = TypeParameterFragmentImpl(
17811773
name: _getFragmentName(nameToken),
@@ -1785,7 +1777,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
17851777

17861778
node.declaredFragment = fragment;
17871779
_linker.elementNodes[fragment] = node;
1788-
_enclosingContext.addTypeParameter(name, fragment);
1780+
_enclosingContext.addTypeParameter(fragment);
17891781

17901782
node.bound?.accept(this);
17911783
}
@@ -1925,18 +1917,11 @@ class _EnclosingContext {
19251917
this.hasDefaultFormalParameters = false,
19261918
});
19271919

1928-
void addFunction(String name, TopLevelFunctionFragmentImpl fragment) {}
1929-
1930-
void addParameter(String? name, FormalParameterFragmentImpl fragment) {
1920+
void addParameter(FormalParameterFragmentImpl fragment) {
19311921
parameters.add(fragment);
19321922
}
19331923

1934-
void addTopLevelVariable(
1935-
String name,
1936-
TopLevelVariableFragmentImpl fragment,
1937-
) {}
1938-
1939-
void addTypeParameter(String name, TypeParameterFragmentImpl fragment) {
1924+
void addTypeParameter(TypeParameterFragmentImpl fragment) {
19401925
typeParameters.add(fragment);
19411926
}
19421927
}

0 commit comments

Comments
 (0)