Skip to content

Commit 95305c3

Browse files
authored
Simplify GeneratorFrontend (#3739)
Previously, this code would determine whether the package graph was `null` (a rather exceptional state), and then carry on a lot of work, even if it was. Instead, we just generate the basic doc layout in this case, and then short circuit return.
1 parent a97508d commit 95305c3

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

lib/src/generator/generator_frontend.dart

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ class GeneratorFrontEnd implements Generator {
3535
);
3636
}
3737

38-
var indexElements = packageGraph == null
39-
? const <Indexable>[]
40-
: _generateDocs(packageGraph);
41-
4238
await _generatorBackend.generateAdditionalFiles();
4339

40+
if (packageGraph == null) {
41+
return;
42+
}
43+
44+
var indexElements = _generateDocs(packageGraph);
4445
var categories = indexElements
4546
.whereType<Categorization>()
4647
.where((e) => e.hasCategorization)
@@ -114,7 +115,7 @@ class GeneratorFrontEnd implements Generator {
114115
}
115116
}
116117

117-
void generateInstanceProperty(Container container) {
118+
void generateInstanceProperties(Container container) {
118119
for (var property in container.instanceFields.whereDocumented) {
119120
if (!property.isCanonical) continue;
120121
indexAccumulator.add(property);
@@ -132,7 +133,7 @@ class GeneratorFrontEnd implements Generator {
132133
}
133134
}
134135

135-
void generateStaticProperty(Container container) {
136+
void generateStaticProperties(Container container) {
136137
for (var property in container.variableStaticFields.whereDocumented) {
137138
if (!property.isCanonical) continue;
138139
indexAccumulator.add(property);
@@ -171,9 +172,9 @@ class GeneratorFrontEnd implements Generator {
171172
generateConstructors(class_);
172173
generateInstanceMethods(class_);
173174
generateInstanceOperators(class_);
174-
generateInstanceProperty(class_);
175+
generateInstanceProperties(class_);
175176
generateStaticMethods(class_);
176-
generateStaticProperty(class_);
177+
generateStaticProperties(class_);
177178
}
178179

179180
for (var extension in lib.extensions.whereDocumented) {
@@ -183,9 +184,9 @@ class GeneratorFrontEnd implements Generator {
183184
generateConstants(extension);
184185
generateInstanceMethods(extension);
185186
generateInstanceOperators(extension);
186-
generateInstanceProperty(extension);
187+
generateInstanceProperties(extension);
187188
generateStaticMethods(extension);
188-
generateStaticProperty(extension);
189+
generateStaticProperties(extension);
189190
}
190191

191192
for (var extensionType in lib.extensionTypes.whereDocumented) {
@@ -197,21 +198,21 @@ class GeneratorFrontEnd implements Generator {
197198
generateConstructors(extensionType);
198199
generateInstanceMethods(extensionType);
199200
generateInstanceOperators(extensionType);
200-
generateInstanceProperty(extensionType);
201+
generateInstanceProperties(extensionType);
201202
generateStaticMethods(extensionType);
202-
generateStaticProperty(extensionType);
203+
generateStaticProperties(extensionType);
203204
}
204205

205206
for (var mixin in lib.mixins.whereDocumented) {
206207
indexAccumulator.add(mixin);
207208
_generatorBackend.generateMixin(packageGraph, lib, mixin);
208209

209210
generateConstants(mixin);
210-
generateInstanceProperty(mixin);
211211
generateInstanceMethods(mixin);
212212
generateInstanceOperators(mixin);
213+
generateInstanceProperties(mixin);
213214
generateStaticMethods(mixin);
214-
generateStaticProperty(mixin);
215+
generateStaticProperties(mixin);
215216
}
216217

217218
for (var enum_ in lib.enums.whereDocumented) {
@@ -222,9 +223,9 @@ class GeneratorFrontEnd implements Generator {
222223
generateConstructors(enum_);
223224
generateInstanceMethods(enum_);
224225
generateInstanceOperators(enum_);
225-
generateInstanceProperty(enum_);
226+
generateInstanceProperties(enum_);
226227
generateStaticMethods(enum_);
227-
generateStaticProperty(enum_);
228+
generateStaticProperties(enum_);
228229
}
229230

230231
for (var constant in lib.constants.whereDocumented) {

0 commit comments

Comments
 (0)