Skip to content

Commit 5ff3c6a

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Write TypeAliasElement2.
Change-Id: I20f6faf818fe9fb18bdfc2587288131609920f55 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415360 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 7678e82 commit 5ff3c6a

25 files changed

+270
-270
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ ImplicitCallReference
610610
staticElement: <testLibraryFragment>::@function::f::@parameter::b
611611
element: <testLibraryFragment>::@function::f::@parameter::b#element
612612
staticType: A
613-
alias: <testLibraryFragment>::@typeAlias::B
613+
alias: <testLibrary>::@typeAlias::B
614614
staticElement: <testLibraryFragment>::@class::A::@method::call
615615
element: <testLibraryFragment>::@class::A::@method::call#element
616616
staticType: void Function()

pkg/analyzer/test/src/dart/resolution/constant_pattern_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ ConstantPattern
358358
element: <testLibraryFragment>::@typeAlias::A
359359
element2: <testLibrary>::@typeAlias::A
360360
type: int
361-
alias: <testLibraryFragment>::@typeAlias::A
361+
alias: <testLibrary>::@typeAlias::A
362362
staticType: Type
363363
matchedValueType: Object?
364364
''');
@@ -418,7 +418,7 @@ ConstantPattern
418418
element: package:test/a.dart::<fragment>::@typeAlias::A
419419
element2: package:test/a.dart::@typeAlias::A
420420
type: int
421-
alias: package:test/a.dart::<fragment>::@typeAlias::A
421+
alias: package:test/a.dart::@typeAlias::A
422422
staticType: Type
423423
matchedValueType: Object?
424424
''');

pkg/analyzer/test/src/dart/resolution/constant_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const v = a;
182182
C<double Function(int)>
183183
typeArguments
184184
double Function(int)
185-
alias: package:test/a.dart::<fragment>::@typeAlias::F
185+
alias: package:test/a.dart::@typeAlias::F
186186
typeArguments
187187
double
188188
variable: <testLibrary>::@topLevelVariable::v

pkg/analyzer/test/src/dart/resolution/function_expression_invocation_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ FunctionExpressionInvocation
407407
staticElement: <testLibraryFragment>::@function::f::@parameter::a
408408
element: <testLibraryFragment>::@function::f::@parameter::a#element
409409
staticType: int Function<T>(T)
410-
alias: <testLibraryFragment>::@typeAlias::F
410+
alias: <testLibrary>::@typeAlias::F
411411
typeArguments
412412
int
413413
typeArguments: TypeArgumentList
@@ -489,7 +489,7 @@ FunctionExpressionInvocation
489489
staticElement: <testLibraryFragment>::@class::A::@getter::foo
490490
element: <testLibraryFragment>::@class::A::@getter::foo#element
491491
staticType: String Function(int, {int b})
492-
alias: <testLibraryFragment>::@typeAlias::F
492+
alias: <testLibrary>::@typeAlias::F
493493
argumentList: ArgumentList
494494
leftParenthesis: (
495495
arguments
@@ -513,7 +513,7 @@ FunctionExpressionInvocation
513513
staticElement: <null>
514514
element: <null>
515515
staticInvokeType: String Function(int, {int b})
516-
alias: <testLibraryFragment>::@typeAlias::F
516+
alias: <testLibrary>::@typeAlias::F
517517
staticType: String
518518
''');
519519
}

pkg/analyzer/test/src/dart/resolution/function_reference_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,14 +2066,14 @@ FunctionReference
20662066
element: <testLibraryFragment>::@typeAlias::Exactly
20672067
element2: <testLibrary>::@typeAlias::Exactly
20682068
type: int Function(int)
2069-
alias: <testLibraryFragment>::@typeAlias::Exactly
2069+
alias: <testLibrary>::@typeAlias::Exactly
20702070
typeArguments
20712071
int
20722072
rightBracket: >
20732073
staticType: void Function()
20742074
typeArgumentTypes
20752075
int Function(int)
2076-
alias: <testLibraryFragment>::@typeAlias::Exactly
2076+
alias: <testLibrary>::@typeAlias::Exactly
20772077
typeArguments
20782078
int
20792079
''');
@@ -2661,14 +2661,14 @@ FunctionReference
26612661
element: <testLibraryFragment>::@typeAlias::Exactly
26622662
element2: <testLibrary>::@typeAlias::Exactly
26632663
type: int Function(int)
2664-
alias: <testLibraryFragment>::@typeAlias::Exactly
2664+
alias: <testLibrary>::@typeAlias::Exactly
26652665
typeArguments
26662666
int
26672667
rightBracket: >
26682668
staticType: void Function()
26692669
typeArgumentTypes
26702670
int Function(int)
2671-
alias: <testLibraryFragment>::@typeAlias::Exactly
2671+
alias: <testLibrary>::@typeAlias::Exactly
26722672
typeArguments
26732673
int
26742674
''');
@@ -4548,7 +4548,7 @@ FunctionReference
45484548
staticElement: <testLibraryFragment>::@function::foo::@parameter::f
45494549
element: <testLibraryFragment>::@function::foo::@parameter::f#element
45504550
staticType: void Function<U>(U)
4551-
alias: <testLibraryFragment>::@typeAlias::Fn
4551+
alias: <testLibrary>::@typeAlias::Fn
45524552
staticType: void Function(int)
45534553
typeArgumentTypes
45544554
int

pkg/analyzer/test/src/dart/resolution/function_type_alias_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ NamedType
3737
element: <testLibraryFragment>::@typeAlias::G
3838
element2: <testLibrary>::@typeAlias::G
3939
type: int Function()
40-
alias: <testLibraryFragment>::@typeAlias::G
40+
alias: <testLibrary>::@typeAlias::G
4141
typeArguments
4242
int
4343
''');

pkg/analyzer/test/src/dart/resolution/generic_type_alias_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ NamedType
261261
element: <testLibraryFragment>::@typeAlias::G
262262
element2: <testLibrary>::@typeAlias::G
263263
type: int Function(double)?
264-
alias: <testLibraryFragment>::@typeAlias::G
264+
alias: <testLibrary>::@typeAlias::G
265265
typeArguments
266266
int
267267
''');

pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,7 @@ FunctionExpressionInvocation
20702070
staticElement: <null>
20712071
element: <null>
20722072
staticInvokeType: double Function(int)
2073-
alias: <testLibraryFragment>::@typeAlias::MyFunction
2073+
alias: <testLibrary>::@typeAlias::MyFunction
20742074
staticType: double
20752075
''');
20762076
}
@@ -7383,14 +7383,14 @@ FunctionExpressionInvocation
73837383
staticElement: <testLibraryFragment>::@function::f::@parameter::a
73847384
element: <testLibraryFragment>::@function::f::@parameter::a#element
73857385
staticType: void Function()
7386-
alias: <testLibraryFragment>::@typeAlias::F
7386+
alias: <testLibrary>::@typeAlias::F
73877387
argumentList: ArgumentList
73887388
leftParenthesis: (
73897389
rightParenthesis: )
73907390
staticElement: <null>
73917391
element: <null>
73927392
staticInvokeType: void Function()
7393-
alias: <testLibraryFragment>::@typeAlias::F
7393+
alias: <testLibrary>::@typeAlias::F
73947394
staticType: void
73957395
''');
73967396
}

pkg/analyzer/test/src/dart/resolution/named_type_test.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ NamedType
350350
element: <testLibraryFragment>::@typeAlias::F
351351
element2: <testLibrary>::@typeAlias::F
352352
type: int Function()
353-
alias: <testLibraryFragment>::@typeAlias::F
353+
alias: <testLibrary>::@typeAlias::F
354354
''');
355355
}
356356

@@ -368,7 +368,7 @@ NamedType
368368
element: <testLibraryFragment>::@typeAlias::F
369369
element2: <testLibrary>::@typeAlias::F
370370
type: num Function()
371-
alias: <testLibraryFragment>::@typeAlias::F
371+
alias: <testLibrary>::@typeAlias::F
372372
typeArguments
373373
num
374374
''');
@@ -388,7 +388,7 @@ NamedType
388388
element: <testLibraryFragment>::@typeAlias::F
389389
element2: <testLibrary>::@typeAlias::F
390390
type: dynamic Function()
391-
alias: <testLibraryFragment>::@typeAlias::F
391+
alias: <testLibrary>::@typeAlias::F
392392
typeArguments
393393
dynamic
394394
''');
@@ -417,7 +417,7 @@ NamedType
417417
element: <testLibraryFragment>::@typeAlias::F
418418
element2: <testLibrary>::@typeAlias::F
419419
type: int Function()
420-
alias: <testLibraryFragment>::@typeAlias::F
420+
alias: <testLibrary>::@typeAlias::F
421421
typeArguments
422422
int
423423
''');
@@ -908,7 +908,7 @@ NamedType
908908
element: <testLibraryFragment>::@typeAlias::X
909909
element2: <testLibrary>::@typeAlias::X
910910
type: Map<int, String>
911-
alias: <testLibraryFragment>::@typeAlias::X
911+
alias: <testLibrary>::@typeAlias::X
912912
typeArguments
913913
String
914914
''');
@@ -930,7 +930,7 @@ NamedType
930930
element: <testLibraryFragment>::@typeAlias::X
931931
element2: <testLibrary>::@typeAlias::X
932932
type: Map<int, String?>
933-
alias: <testLibraryFragment>::@typeAlias::X
933+
alias: <testLibrary>::@typeAlias::X
934934
typeArguments
935935
String?
936936
''');
@@ -958,7 +958,7 @@ NamedType
958958
element: <testLibraryFragment>::@typeAlias::X
959959
element2: <testLibrary>::@typeAlias::X
960960
type: List<int?>
961-
alias: <testLibraryFragment>::@typeAlias::X
961+
alias: <testLibrary>::@typeAlias::X
962962
typeArguments
963963
int
964964
''');
@@ -980,7 +980,7 @@ NamedType
980980
element: <testLibraryFragment>::@typeAlias::X
981981
element2: <testLibrary>::@typeAlias::X
982982
type: List<int?>
983-
alias: <testLibraryFragment>::@typeAlias::X
983+
alias: <testLibrary>::@typeAlias::X
984984
typeArguments
985985
int?
986986
''');
@@ -1060,7 +1060,7 @@ NamedType
10601060
element: <testLibraryFragment>::@typeAlias::X
10611061
element2: <testLibrary>::@typeAlias::X
10621062
type: int?
1063-
alias: <testLibraryFragment>::@typeAlias::X
1063+
alias: <testLibrary>::@typeAlias::X
10641064
typeArguments
10651065
int
10661066
''');
@@ -1088,7 +1088,7 @@ NamedType
10881088
element: <testLibraryFragment>::@typeAlias::X
10891089
element2: <testLibrary>::@typeAlias::X
10901090
type: Map<int, String>
1091-
alias: <testLibraryFragment>::@typeAlias::X
1091+
alias: <testLibrary>::@typeAlias::X
10921092
typeArguments
10931093
String
10941094
''');

pkg/analyzer/test/src/dart/resolution/non_nullable_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ FieldDeclaration
6262
element: <testLibraryFragment>::@typeAlias::F
6363
element2: <testLibrary>::@typeAlias::F
6464
type: T Function<T>(int, T)?
65-
alias: <testLibraryFragment>::@typeAlias::F
65+
alias: <testLibrary>::@typeAlias::F
6666
variables
6767
VariableDeclaration
6868
name: f

0 commit comments

Comments
 (0)