Skip to content

Commit 69e98d3

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Update test expectations format for future element / fragment changes.
Most significant changes: 1. Don't write "reference" for fragments, they will not have it. 2. Write `#F<num>` for fragments as unique identifiers instead. 3. Where we used to write "xyz#element", pretend that there is actual element reference, because the next CL will give it to all non-local elements. Change-Id: I2ff0416ca904544de3b01c7657b4e9872b14df17 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/434744 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]>
1 parent c2095cb commit 69e98d3

File tree

133 files changed

+39210
-36201
lines changed

Some content is hidden

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

133 files changed

+39210
-36201
lines changed

pkg/analyzer/test/generated/resolver_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ A f(A p) {
257257
MethodInvocation
258258
target: SimpleIdentifier
259259
token: p
260-
element: <testLibraryFragment>::@function::f::@parameter::p#element
260+
element: <testLibrary>::@function::f::@formalParameter::p
261261
staticType: B
262262
operator: .
263263
methodName: SimpleIdentifier

pkg/analyzer/test/generated/simple_resolver_test.dart

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ class A {
514514
assertResolvedNodeText(findNode.simple('x {}'), r'''
515515
SimpleIdentifier
516516
token: x
517-
element: <testLibraryFragment>::@class::A::@constructor::new::@parameter::x#element
517+
element: <testLibrary>::@class::A::@constructor::new::@formalParameter::x
518518
staticType: int
519519
''');
520520
}
@@ -577,7 +577,7 @@ class C extends B with M1, M2 {
577577
assertResolvedNodeText(findNode.simple('x;'), r'''
578578
SimpleIdentifier
579579
token: x
580-
element: <testLibraryFragment>::@mixin::M2::@getter::x#element
580+
element: <testLibrary>::@mixin::M2::@getter::x
581581
staticType: dynamic
582582
''');
583583
}
@@ -605,7 +605,7 @@ void main() {
605605
assertResolvedNodeText(findNode.simple('x;'), r'''
606606
SimpleIdentifier
607607
token: x
608-
element: <testLibraryFragment>::@mixin::M2::@getter::x#element
608+
element: <testLibrary>::@mixin::M2::@getter::x
609609
staticType: dynamic
610610
''');
611611
}
@@ -875,9 +875,9 @@ Annotation
875875
atSign: @
876876
name: SimpleIdentifier
877877
token: A
878-
element: <testLibraryFragment>::@getter::A#element
878+
element: <testLibrary>::@getter::A
879879
staticType: null
880-
element2: <testLibraryFragment>::@getter::A#element
880+
element2: <testLibrary>::@getter::A
881881
''');
882882
}
883883

@@ -898,9 +898,9 @@ Annotation
898898
atSign: @
899899
name: SimpleIdentifier
900900
token: A
901-
element: <testLibraryFragment>::@getter::A#element
901+
element: <testLibrary>::@getter::A
902902
staticType: null
903-
element2: <testLibraryFragment>::@getter::A#element
903+
element2: <testLibrary>::@getter::A
904904
''');
905905
}
906906

@@ -919,9 +919,9 @@ Annotation
919919
atSign: @
920920
name: SimpleIdentifier
921921
token: A
922-
element: <testLibraryFragment>::@getter::A#element
922+
element: <testLibrary>::@getter::A
923923
staticType: null
924-
element2: <testLibraryFragment>::@getter::A#element
924+
element2: <testLibrary>::@getter::A
925925
''');
926926
}
927927

@@ -939,9 +939,9 @@ Annotation
939939
atSign: @
940940
name: SimpleIdentifier
941941
token: A
942-
element: <testLibraryFragment>::@getter::A#element
942+
element: <testLibrary>::@getter::A
943943
staticType: null
944-
element2: <testLibraryFragment>::@getter::A#element
944+
element2: <testLibrary>::@getter::A
945945
''');
946946
}
947947

@@ -991,9 +991,9 @@ Annotation
991991
atSign: @
992992
name: SimpleIdentifier
993993
token: A
994-
element: <testLibraryFragment>::@getter::A#element
994+
element: <testLibrary>::@getter::A
995995
staticType: null
996-
element2: <testLibraryFragment>::@getter::A#element
996+
element2: <testLibrary>::@getter::A
997997
''');
998998
}
999999

@@ -1012,9 +1012,9 @@ Annotation
10121012
atSign: @
10131013
name: SimpleIdentifier
10141014
token: A
1015-
element: <testLibraryFragment>::@getter::A#element
1015+
element: <testLibrary>::@getter::A
10161016
staticType: null
1017-
element2: <testLibraryFragment>::@getter::A#element
1017+
element2: <testLibrary>::@getter::A
10181018
''');
10191019
}
10201020

@@ -1041,9 +1041,9 @@ Annotation
10411041
atSign: @
10421042
name: SimpleIdentifier
10431043
token: A
1044-
element: <testLibraryFragment>::@getter::A#element
1044+
element: <testLibrary>::@getter::A
10451045
staticType: null
1046-
element2: <testLibraryFragment>::@getter::A#element
1046+
element2: <testLibrary>::@getter::A
10471047
''');
10481048
}
10491049

@@ -1062,9 +1062,9 @@ Annotation
10621062
atSign: @
10631063
name: SimpleIdentifier
10641064
token: A
1065-
element: <testLibraryFragment>::@getter::A#element
1065+
element: <testLibrary>::@getter::A
10661066
staticType: null
1067-
element2: <testLibraryFragment>::@getter::A#element
1067+
element2: <testLibrary>::@getter::A
10681068
''');
10691069
}
10701070

@@ -1104,9 +1104,9 @@ Annotation
11041104
atSign: @
11051105
name: SimpleIdentifier
11061106
token: A
1107-
element: <testLibraryFragment>::@getter::A#element
1107+
element: <testLibrary>::@getter::A
11081108
staticType: null
1109-
element2: <testLibraryFragment>::@getter::A#element
1109+
element2: <testLibrary>::@getter::A
11101110
''');
11111111
}
11121112

@@ -1124,9 +1124,9 @@ Annotation
11241124
atSign: @
11251125
name: SimpleIdentifier
11261126
token: A
1127-
element: <testLibraryFragment>::@getter::A#element
1127+
element: <testLibrary>::@getter::A
11281128
staticType: null
1129-
element2: <testLibraryFragment>::@getter::A#element
1129+
element2: <testLibrary>::@getter::A
11301130
''');
11311131
}
11321132

@@ -1170,9 +1170,9 @@ Annotation
11701170
atSign: @
11711171
name: SimpleIdentifier
11721172
token: A
1173-
element: <testLibraryFragment>::@getter::A#element
1173+
element: <testLibrary>::@getter::A
11741174
staticType: null
1175-
element2: <testLibraryFragment>::@getter::A#element
1175+
element2: <testLibrary>::@getter::A
11761176
''');
11771177
}
11781178

0 commit comments

Comments
 (0)