Skip to content

Commit 147ba50

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Print ConstructorElementImpl references in text expectations.
Change-Id: I090dc6f9471dae969480caeba0204401dbf280e8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432724 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent d116d50 commit 147ba50

File tree

65 files changed

+2072
-2075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2072
-2075
lines changed

‎pkg/analyzer/lib/src/dart/analysis/driver.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
110110
// TODO(scheglov): Clean up the list of implicitly analyzed files.
111111
class AnalysisDriver {
112112
/// The version of data format, should be incremented on every format change.
113-
static const int DATA_VERSION = 471;
113+
static const int DATA_VERSION = 472;
114114

115115
/// The number of exception contexts allowed to write. Once this field is
116116
/// zero, we stop writing any new exception contexts in this process.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
19111911

19121912
var containerBuilder = _enclosingContext.instanceElementBuilder!;
19131913
var containerElement = containerBuilder.element;
1914-
var containerRef = containerElement.reference!.getChild('@method');
1914+
var containerRef = containerElement.reference!.getChild('@constructor');
19151915
var elementReference = containerRef.addChild(
19161916
extensionFragment.name2 ?? 'new',
19171917
);

‎pkg/analyzer/test/generated/strong_mode_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4407,7 +4407,7 @@ MethodInvocation
44074407
element2: <testLibrary>::@class::C
44084408
type: C<S>
44094409
element: ConstructorMember
4410-
baseElement: <testLibraryFragment>::@class::C::@constructor::new#element
4410+
baseElement: <testLibrary>::@class::C::@constructor::new
44114411
substitution: {T: S}
44124412
argumentList: ArgumentList
44134413
leftParenthesis: (
@@ -4481,7 +4481,7 @@ MethodInvocation
44814481
element2: <testLibrary>::@class::C
44824482
type: C<S>
44834483
element: ConstructorMember
4484-
baseElement: <testLibraryFragment>::@class::C::@constructor::new#element
4484+
baseElement: <testLibrary>::@class::C::@constructor::new
44854485
substitution: {T: S}
44864486
argumentList: ArgumentList
44874487
leftParenthesis: (

‎pkg/analyzer/test/src/dart/ast/element_locator_test.dart‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class A {
9494
var node = findNode.constructor('A.foo()');
9595
var element = ElementLocator.locate2(node);
9696
_assertElement(element, r'''
97-
<testLibraryFragment>::@class::A::@constructor::foo#element
97+
<testLibrary>::@class::A::@constructor::foo
9898
''');
9999
}
100100

@@ -107,7 +107,7 @@ class A {
107107
var node = findNode.constructor('A()');
108108
var element = ElementLocator.locate2(node);
109109
_assertElement(element, r'''
110-
<testLibraryFragment>::@class::A::@constructor::new#element
110+
<testLibrary>::@class::A::@constructor::new
111111
''');
112112
}
113113

@@ -121,7 +121,7 @@ enum E {
121121
var node = findNode.constructorSelector('named(); // 0');
122122
var element = ElementLocator.locate2(node);
123123
_assertElement(element, r'''
124-
<testLibraryFragment>::@enum::E::@constructor::named#element
124+
<testLibrary>::@enum::E::@constructor::named
125125
''');
126126
}
127127

@@ -149,7 +149,7 @@ void main() {
149149
var node = findNode.singleDotShorthandConstructorInvocation;
150150
var element = ElementLocator.locate2(node);
151151
_assertElement(element, r'''
152-
<testLibraryFragment>::@class::A::@constructor::new#element
152+
<testLibrary>::@class::A::@constructor::new
153153
''');
154154
}
155155

@@ -273,7 +273,7 @@ void main(@Class() parameter) {}
273273
var node = findNode.simple('Class() parameter');
274274
var element = ElementLocator.locate2(node);
275275
_assertElement(element, r'''
276-
<testLibraryFragment>::@class::Class::@constructor::new#element
276+
<testLibrary>::@class::Class::@constructor::new
277277
''');
278278
}
279279

@@ -295,7 +295,7 @@ class A {
295295
var node = findNode.constructor('bar');
296296
var element = ElementLocator.locate2(node);
297297
_assertElement(element, r'''
298-
<testLibraryFragment>::@class::A::@constructor::bar#element
298+
<testLibrary>::@class::A::@constructor::bar
299299
''');
300300
}
301301

@@ -308,7 +308,7 @@ class A {
308308
var node = findNode.simple('A()');
309309
var element = ElementLocator.locate2(node);
310310
_assertElement(element, r'''
311-
<testLibraryFragment>::@class::A::@constructor::new#element
311+
<testLibrary>::@class::A::@constructor::new
312312
''');
313313
}
314314

@@ -383,7 +383,7 @@ void main() {
383383
var node = findNode.instanceCreation('new A()');
384384
var element = ElementLocator.locate2(node);
385385
_assertElement(element, r'''
386-
<testLibraryFragment>::@class::A::@constructor::new#element
386+
<testLibrary>::@class::A::@constructor::new
387387
''');
388388
}
389389

@@ -401,7 +401,7 @@ void main() {
401401
var node = findNode.instanceCreation('A();');
402402
var element = ElementLocator.locate2(node);
403403
_assertElement(element, r'''
404-
package:test/a.dart::<fragment>::@class::A::@constructor::new#element
404+
package:test/a.dart::@class::A::@constructor::new
405405
''');
406406
}
407407

@@ -418,7 +418,7 @@ void main() {
418418
var node = findNode.instanceCreation('A();');
419419
var element = ElementLocator.locate2(node);
420420
_assertElement(element, r'''
421-
<testLibraryFragment>::@class::A::@constructor::new#element
421+
<testLibrary>::@class::A::@constructor::new
422422
''');
423423
}
424424

@@ -565,7 +565,7 @@ dart:core::@class::num::@method::+
565565
var node = findNode.singleRepresentationConstructorName;
566566
var element = ElementLocator.locate2(node);
567567
_assertElement(element, r'''
568-
<testLibraryFragment>::@extensionType::A::@constructor::named#element
568+
<testLibrary>::@extensionType::A::@constructor::A
569569
''');
570570
}
571571

‎pkg/analyzer/test/src/dart/constant/evaluation_test.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ const c = C<int>.foo;
15891589
var result = _topLevelVar('c');
15901590
assertDartObjectText(result, r'''
15911591
C<int> Function()
1592-
element: <testLibraryFragment>::@class::C::@constructor::foo#element
1592+
element: <testLibrary>::@class::C::@constructor::foo
15931593
typeArguments
15941594
int
15951595
variable: <testLibrary>::@topLevelVariable::c
@@ -1606,7 +1606,7 @@ const c = C<int>.new;
16061606
var result = _topLevelVar('c');
16071607
assertDartObjectText(result, r'''
16081608
C<int> Function()
1609-
element: <testLibraryFragment>::@class::C::@constructor::new#element
1609+
element: <testLibrary>::@class::C::@constructor::new
16101610
typeArguments
16111611
int
16121612
variable: <testLibrary>::@topLevelVariable::c
@@ -1898,7 +1898,7 @@ const c = C<int>.foo;
18981898
var result = _topLevelVar('c');
18991899
assertDartObjectText(result, r'''
19001900
C<int> Function()
1901-
element: <testLibraryFragment>::@class::C::@constructor::foo#element
1901+
element: <testLibrary>::@class::C::@constructor::foo
19021902
typeArguments
19031903
int
19041904
variable: <testLibrary>::@topLevelVariable::c
@@ -1915,7 +1915,7 @@ const c = C<int>.new;
19151915
var result = _topLevelVar('c');
19161916
assertDartObjectText(result, r'''
19171917
C<int> Function()
1918-
element: <testLibraryFragment>::@class::C::@constructor::new#element
1918+
element: <testLibrary>::@class::C::@constructor::new
19191919
typeArguments
19201920
int
19211921
variable: <testLibrary>::@topLevelVariable::c

‎pkg/analyzer/test/src/dart/resolution/assignment_test.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@ AssignmentExpression
24402440
name: B
24412441
element2: <testLibrary>::@class::B
24422442
type: B
2443-
element: <testLibraryFragment>::@class::B::@constructor::new#element
2443+
element: <testLibrary>::@class::B::@constructor::new
24442444
argumentList: ArgumentList
24452445
leftParenthesis: (
24462446
rightParenthesis: )
@@ -4491,7 +4491,7 @@ AssignmentExpression
44914491
name: C
44924492
element2: <testLibrary>::@class::C
44934493
type: C
4494-
element: <testLibraryFragment>::@class::C::@constructor::new#element
4494+
element: <testLibrary>::@class::C::@constructor::new
44954495
argumentList: ArgumentList
44964496
leftParenthesis: (
44974497
rightParenthesis: )
@@ -5108,7 +5108,7 @@ AssignmentExpression
51085108
name: C
51095109
element2: <testLibrary>::@class::C
51105110
type: C
5111-
element: <testLibraryFragment>::@class::C::@constructor::new#element
5111+
element: <testLibrary>::@class::C::@constructor::new
51125112
argumentList: ArgumentList
51135113
leftParenthesis: (
51145114
rightParenthesis: )

‎pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ InstanceCreationExpression
715715
element2: <testLibrary>::@class::A
716716
type: A<int, String>
717717
element: ConstructorMember
718-
baseElement: <testLibraryFragment>::@class::A::@constructor::new#element
718+
baseElement: <testLibrary>::@class::A::@constructor::new
719719
substitution: {T: int, U: String}
720720
argumentList: ArgumentList
721721
leftParenthesis: (
@@ -853,7 +853,7 @@ InstanceCreationExpression
853853
element2: <testLibrary>::@typeAlias::X
854854
type: A<int, String>
855855
element: ConstructorMember
856-
baseElement: <testLibraryFragment>::@class::A::@constructor::new#element
856+
baseElement: <testLibrary>::@class::A::@constructor::new
857857
substitution: {T: int, U: String}
858858
argumentList: ArgumentList
859859
leftParenthesis: (
@@ -916,11 +916,11 @@ InstanceCreationExpression
916916
name: SimpleIdentifier
917917
token: named
918918
element: ConstructorMember
919-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::named#element
919+
baseElement: package:test/a.dart::@class::A::@constructor::named
920920
substitution: {T: dynamic}
921921
staticType: null
922922
element: ConstructorMember
923-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::named#element
923+
baseElement: package:test/a.dart::@class::A::@constructor::named
924924
substitution: {T: int}
925925
argumentList: ArgumentList
926926
leftParenthesis: (
@@ -985,11 +985,11 @@ InstanceCreationExpression
985985
name: SimpleIdentifier
986986
token: named
987987
element: ConstructorMember
988-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::named#element
988+
baseElement: package:test/a.dart::@class::A::@constructor::named
989989
substitution: {T: int}
990990
staticType: null
991991
element: ConstructorMember
992-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::named#element
992+
baseElement: package:test/a.dart::@class::A::@constructor::named
993993
substitution: {T: int}
994994
argumentList: ArgumentList
995995
leftParenthesis: (
@@ -1054,11 +1054,11 @@ InstanceCreationExpression
10541054
name: SimpleIdentifier
10551055
token: new
10561056
element: ConstructorMember
1057-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::new#element
1057+
baseElement: package:test/a.dart::@class::A::@constructor::new
10581058
substitution: {T: int}
10591059
staticType: null
10601060
element: ConstructorMember
1061-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::new#element
1061+
baseElement: package:test/a.dart::@class::A::@constructor::new
10621062
substitution: {T: int}
10631063
argumentList: ArgumentList
10641064
leftParenthesis: (
@@ -1157,11 +1157,11 @@ InstanceCreationExpression
11571157
name: SimpleIdentifier
11581158
token: named
11591159
element: ConstructorMember
1160-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::named#element
1160+
baseElement: package:test/a.dart::@class::A::@constructor::named
11611161
substitution: {T: dynamic}
11621162
staticType: null
11631163
element: ConstructorMember
1164-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::named#element
1164+
baseElement: package:test/a.dart::@class::A::@constructor::named
11651165
substitution: {T: int}
11661166
argumentList: ArgumentList
11671167
leftParenthesis: (
@@ -1200,11 +1200,11 @@ InstanceCreationExpression
12001200
name: SimpleIdentifier
12011201
token: named
12021202
element: ConstructorMember
1203-
baseElement: <testLibraryFragment>::@class::A::@constructor::named#element
1203+
baseElement: <testLibrary>::@class::A::@constructor::named
12041204
substitution: {T: dynamic}
12051205
staticType: null
12061206
element: ConstructorMember
1207-
baseElement: <testLibraryFragment>::@class::A::@constructor::named#element
1207+
baseElement: <testLibrary>::@class::A::@constructor::named
12081208
substitution: {T: int}
12091209
argumentList: ArgumentList
12101210
leftParenthesis: (
@@ -1254,11 +1254,11 @@ InstanceCreationExpression
12541254
name: SimpleIdentifier
12551255
token: named
12561256
element: ConstructorMember
1257-
baseElement: <testLibraryFragment>::@class::A::@constructor::named#element
1257+
baseElement: <testLibrary>::@class::A::@constructor::named
12581258
substitution: {T: dynamic, U: dynamic}
12591259
staticType: null
12601260
element: ConstructorMember
1261-
baseElement: <testLibraryFragment>::@class::A::@constructor::named#element
1261+
baseElement: <testLibrary>::@class::A::@constructor::named
12621262
substitution: {T: dynamic, U: dynamic}
12631263
typeArguments: TypeArgumentList
12641264
leftBracket: <
@@ -1320,11 +1320,11 @@ InstanceCreationExpression
13201320
name: SimpleIdentifier
13211321
token: new
13221322
element: ConstructorMember
1323-
baseElement: <testLibraryFragment>::@class::A::@constructor::new#element
1323+
baseElement: <testLibrary>::@class::A::@constructor::new
13241324
substitution: {T: dynamic, U: dynamic}
13251325
staticType: null
13261326
element: ConstructorMember
1327-
baseElement: <testLibraryFragment>::@class::A::@constructor::new#element
1327+
baseElement: <testLibrary>::@class::A::@constructor::new
13281328
substitution: {T: dynamic, U: dynamic}
13291329
typeArguments: TypeArgumentList
13301330
leftBracket: <
@@ -1428,7 +1428,7 @@ InstanceCreationExpression
14281428
element2: package:test/a.dart::@class::A
14291429
type: A<int, String>
14301430
element: ConstructorMember
1431-
baseElement: package:test/a.dart::<fragment>::@class::A::@constructor::new#element
1431+
baseElement: package:test/a.dart::@class::A::@constructor::new
14321432
substitution: {T: int, U: String}
14331433
argumentList: ArgumentList
14341434
leftParenthesis: (
@@ -1574,11 +1574,11 @@ InstanceCreationExpression
15741574
name: SimpleIdentifier
15751575
token: named
15761576
element: ConstructorMember
1577-
baseElement: <testLibraryFragment>::@class::A::@constructor::named#element
1577+
baseElement: <testLibrary>::@class::A::@constructor::named
15781578
substitution: {T: dynamic}
15791579
staticType: null
15801580
element: ConstructorMember
1581-
baseElement: <testLibraryFragment>::@class::A::@constructor::named#element
1581+
baseElement: <testLibrary>::@class::A::@constructor::named
15821582
substitution: {T: int}
15831583
argumentList: ArgumentList
15841584
leftParenthesis: (
@@ -1639,9 +1639,9 @@ ConstructorReference
16391639
period: .
16401640
name: SimpleIdentifier
16411641
token: new
1642-
element: <testLibraryFragment>::@class::C::@constructor::new#element
1642+
element: <testLibrary>::@class::C::@constructor::new
16431643
staticType: null
1644-
element: <testLibraryFragment>::@class::C::@constructor::new#element
1644+
element: <testLibrary>::@class::C::@constructor::new
16451645
correspondingParameter: <testLibraryFragment>::@setter::f::@parameter::_f#element
16461646
staticType: C Function()
16471647
''');

0 commit comments

Comments
 (0)