Skip to content

Commit 0a1e03d

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Fine. Use shared _writelnIdList(), distinguish 'not asked' from 'empty'.
Change-Id: I3db287dd7e18e3dabded40c285b165a8bb6ff104 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448425 Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent d40c3ef commit 0a1e03d

File tree

2 files changed

+57
-27
lines changed

2 files changed

+57
-27
lines changed

‎pkg/analyzer/test/src/dart/analysis/driver_test.dart‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5895,6 +5895,9 @@ class B extends A {}
58955895
A: #M0
58965896
instances
58975897
A
5898+
allDeclaredGetters: []
5899+
allDeclaredSetters: []
5900+
allDeclaredMethods: []
58985901
interfaces
58995902
A
59005903
allConstructors: #M4
@@ -5956,7 +5959,7 @@ class A {
59565959
libraryUri: package:test/a.dart
59575960
instanceName: A
59585961
childrenPropertyName: getters
5959-
expectedIds:
5962+
expectedIds: []
59605963
actualIds: #M6
59615964
[operation] analyzeFile
59625965
file: /home/test/lib/test.dart
@@ -5974,6 +5977,7 @@ class A {
59745977
foo: #M5
59755978
allDeclaredGetters: #M6
59765979
allDeclaredSetters: #M7
5980+
allDeclaredMethods: []
59775981
interfaces
59785982
A
59795983
allConstructors: #M4
@@ -6035,6 +6039,9 @@ class B extends A {}
60356039
A: #M0
60366040
instances
60376041
A
6042+
allDeclaredGetters: []
6043+
allDeclaredSetters: []
6044+
allDeclaredMethods: []
60386045
interfaces
60396046
A
60406047
allConstructors: #M4
@@ -6090,7 +6097,7 @@ class A {
60906097
libraryUri: package:test/a.dart
60916098
instanceName: A
60926099
childrenPropertyName: getters
6093-
expectedIds:
6100+
expectedIds: []
60946101
actualIds: #M6
60956102
[operation] analyzeFile
60966103
file: /home/test/lib/test.dart
@@ -6106,6 +6113,7 @@ class A {
61066113
A
61076114
allDeclaredGetters: #M6
61086115
allDeclaredSetters: #M7
6116+
allDeclaredMethods: []
61096117
interfaces
61106118
A
61116119
allConstructors: #M4
@@ -6662,6 +6670,7 @@ class B extends A {}
66626670
foo: #M1
66636671
allDeclaredGetters: #M2
66646672
allDeclaredSetters: #M3
6673+
allDeclaredMethods: []
66656674
interfaces
66666675
A
66676676
allConstructors: #M7
@@ -6747,6 +6756,7 @@ class A {
67476756
foo: #M8
67486757
allDeclaredGetters: #M9
67496758
allDeclaredSetters: #M3
6759+
allDeclaredMethods: []
67506760
interfaces
67516761
A
67526762
allConstructors: #M7
@@ -8446,6 +8456,8 @@ class B extends A {}
84468456
A: #M0
84478457
instances
84488458
A
8459+
allDeclaredGetters: []
8460+
allDeclaredSetters: []
84498461
allDeclaredMethods: #M2 #M1
84508462
interfaces
84518463
A
@@ -8525,6 +8537,8 @@ class A {
85258537
A: #M0
85268538
instances
85278539
A
8540+
allDeclaredGetters: []
8541+
allDeclaredSetters: []
85288542
allDeclaredMethods: #M7 #M1
85298543
interfaces
85308544
A
@@ -8616,10 +8630,17 @@ class X extends C {}
86168630
C: #M6
86178631
instances
86188632
A
8633+
allDeclaredGetters: []
8634+
allDeclaredSetters: []
86198635
allDeclaredMethods: #M1
86208636
B
8637+
allDeclaredGetters: []
8638+
allDeclaredSetters: []
86218639
allDeclaredMethods: #M4
86228640
C
8641+
allDeclaredGetters: []
8642+
allDeclaredSetters: []
8643+
allDeclaredMethods: []
86238644
interfaces
86248645
C
86258646
allConstructors: #M11
@@ -8712,10 +8733,17 @@ class C extends A implements B {}
87128733
C: #M6
87138734
instances
87148735
A
8736+
allDeclaredGetters: []
8737+
allDeclaredSetters: []
87158738
allDeclaredMethods: #M12
87168739
B
8740+
allDeclaredGetters: []
8741+
allDeclaredSetters: []
87178742
allDeclaredMethods: #M4
87188743
C
8744+
allDeclaredGetters: []
8745+
allDeclaredSetters: []
8746+
allDeclaredMethods: []
87198747
interfaces
87208748
C
87218749
allConstructors: #M11
@@ -13601,6 +13629,9 @@ class B extends A {
1360113629
named: <null>
1360213630
instances
1360313631
A
13632+
allDeclaredGetters: []
13633+
allDeclaredSetters: []
13634+
allDeclaredMethods: []
1360413635
interfaces
1360513636
A
1360613637
allConstructors: #M1
@@ -13676,6 +13707,9 @@ class A {
1367613707
named: <null>
1367713708
instances
1367813709
A
13710+
allDeclaredGetters: []
13711+
allDeclaredSetters: []
13712+
allDeclaredMethods: []
1367913713
interfaces
1368013714
A
1368113715
allConstructors: #M6
@@ -28122,6 +28156,9 @@ base class X implements A {}
2812228156
A: #M0
2812328157
instances
2812428158
A
28159+
allDeclaredGetters: []
28160+
allDeclaredSetters: []
28161+
allDeclaredMethods: []
2812528162
[status] idle
2812628163
[future] getErrors T1
2812728164
ErrorsResult #0

‎pkg/analyzer/test/src/dart/analysis/result_printer.dart‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,7 @@ class BundleRequirementsPrinter {
8484
}
8585

8686
void _writeExportedExtensions(LibraryRequirements requirements) {
87-
if (requirements.exportedExtensions case var extensions?) {
88-
var idListStr = extensions.asString(idProvider);
89-
if (idListStr.isEmpty) {
90-
idListStr = '[]';
91-
}
92-
sink.writelnWithIndent('exportedExtensions: $idListStr');
93-
}
87+
_writelnIdList('exportedExtensions', requirements.exportedExtensions);
9488
}
9589

9690
void _writeExportedTopLevels(LibraryRequirements requirements) {
@@ -168,26 +162,19 @@ class BundleRequirementsPrinter {
168162
});
169163

170164
sink.withIndent(() {
171-
void writeAllDeclared(String name, ManifestItemIdList? idList) {
172-
if (idList != null && idList.ids.isNotEmpty) {
173-
var idListStr = idList.asString(idProvider);
174-
sink.writelnWithIndent('$name: $idListStr');
175-
}
176-
}
177-
178-
writeAllDeclared(
165+
_writelnIdList(
179166
'allDeclaredFields',
180167
instanceRequirements.allDeclaredFields,
181168
);
182-
writeAllDeclared(
169+
_writelnIdList(
183170
'allDeclaredGetters',
184171
instanceRequirements.allDeclaredGetters,
185172
);
186-
writeAllDeclared(
173+
_writelnIdList(
187174
'allDeclaredSetters',
188175
instanceRequirements.allDeclaredSetters,
189176
);
190-
writeAllDeclared(
177+
_writelnIdList(
191178
'allDeclaredMethods',
192179
instanceRequirements.allDeclaredMethods,
193180
);
@@ -208,12 +195,7 @@ class BundleRequirementsPrinter {
208195
if (requirements.hasNonFinalField case var value?) {
209196
sink.writelnWithIndent('hasNonFinalField: $value');
210197
}
211-
if (requirements.allConstructors case var allConstructors?) {
212-
if (allConstructors.ids.isNotEmpty) {
213-
var idListStr = allConstructors.asString(idProvider);
214-
sink.writelnWithIndent('allConstructors: $idListStr');
215-
}
216-
}
198+
_writelnIdList('allConstructors', requirements.allConstructors);
217199
sink.writeElements(
218200
'requestedConstructors',
219201
requirements.requestedConstructors.sorted,
@@ -228,6 +210,13 @@ class BundleRequirementsPrinter {
228210
});
229211
}
230212

213+
void _writelnIdList(String name, ManifestItemIdList? idList) {
214+
if (idList != null) {
215+
var idListStr = idList.asString(idProvider);
216+
sink.writelnWithIndent('$name: $idListStr');
217+
}
218+
}
219+
231220
void _writeNamedId(MapEntry<LookupName, ManifestItemId?> entry) {
232221
if (entry.value case var id?) {
233222
var idStr = idProvider.manifestId(id);
@@ -1789,7 +1778,11 @@ class UnitElementPrinterConfiguration {
17891778

17901779
extension on ManifestItemIdList {
17911780
String asString(IdProvider idProvider) {
1792-
return ids.map((id) => idProvider.manifestId(id)).join(' ');
1781+
if (ids.isNotEmpty) {
1782+
return ids.map((id) => idProvider.manifestId(id)).join(' ');
1783+
} else {
1784+
return '[]';
1785+
}
17931786
}
17941787
}
17951788

0 commit comments

Comments
 (0)