@@ -72,66 +72,66 @@ class GeneratorFrontEnd implements Generator {
72
72
var indexAccumulator = < Indexable > [];
73
73
var multiplePackages = packageGraph.localPackages.length > 1 ;
74
74
75
- void generateConstants (Container container) {
75
+ void generateConstants (Container container, Library library ) {
76
76
for (var constant in container.constantFields.whereDocumented) {
77
77
if (! constant.isCanonical) continue ;
78
78
indexAccumulator.add (constant);
79
79
_generatorBackend.generateProperty (
80
- packageGraph, container. library, container, constant);
80
+ packageGraph, library, container, constant);
81
81
}
82
82
}
83
83
84
- void generateConstructors (Constructable constructable) {
84
+ void generateConstructors (Constructable constructable, Library library ) {
85
85
for (var constructor in constructable.constructors.whereDocumented) {
86
86
if (! constructor.isCanonical) continue ;
87
87
indexAccumulator.add (constructor);
88
88
_generatorBackend.generateConstructor (
89
- packageGraph, constructable. library, constructable, constructor);
89
+ packageGraph, library, constructable, constructor);
90
90
}
91
91
}
92
92
93
- void generateInstanceMethods (Container container) {
93
+ void generateInstanceMethods (Container container, Library library ) {
94
94
for (var method in container.instanceMethods.whereDocumented) {
95
95
if (! method.isCanonical) continue ;
96
96
indexAccumulator.add (method);
97
97
_generatorBackend.generateMethod (
98
- packageGraph, container. library, container, method);
98
+ packageGraph, library, container, method);
99
99
}
100
100
}
101
101
102
- void generateInstanceOperators (Container container) {
102
+ void generateInstanceOperators (Container container, Library library ) {
103
103
for (var operator in container.instanceOperators.whereDocumented) {
104
104
if (! operator .isCanonical) continue ;
105
105
indexAccumulator.add (operator );
106
106
_generatorBackend.generateMethod (
107
- packageGraph, container. library, container, operator );
107
+ packageGraph, library, container, operator );
108
108
}
109
109
}
110
110
111
- void generateInstanceProperties (Container container) {
111
+ void generateInstanceProperties (Container container, Library library ) {
112
112
for (var property in container.instanceFields.whereDocumented) {
113
113
if (! property.isCanonical) continue ;
114
114
indexAccumulator.add (property);
115
115
_generatorBackend.generateProperty (
116
- packageGraph, container. library, container, property);
116
+ packageGraph, library, container, property);
117
117
}
118
118
}
119
119
120
- void generateStaticMethods (Container container) {
120
+ void generateStaticMethods (Container container, Library library ) {
121
121
for (var method in container.staticMethods.whereDocumented) {
122
122
if (! method.isCanonical) continue ;
123
123
indexAccumulator.add (method);
124
124
_generatorBackend.generateMethod (
125
- packageGraph, container. library, container, method);
125
+ packageGraph, library, container, method);
126
126
}
127
127
}
128
128
129
- void generateStaticProperties (Container container) {
129
+ void generateStaticProperties (Container container, Library library ) {
130
130
for (var property in container.variableStaticFields.whereDocumented) {
131
131
if (! property.isCanonical) continue ;
132
132
indexAccumulator.add (property);
133
133
_generatorBackend.generateProperty (
134
- packageGraph, container. library, container, property);
134
+ packageGraph, library, container, property);
135
135
}
136
136
}
137
137
@@ -157,88 +157,93 @@ class GeneratorFrontEnd implements Generator {
157
157
indexAccumulator.add (lib);
158
158
_generatorBackend.generateLibrary (packageGraph, lib);
159
159
160
- for (var class_ in lib.classesAndExceptions.whereDocumented ) {
160
+ for (var class_ in lib.classesAndExceptions.whereDocumentedIn (lib) ) {
161
161
indexAccumulator.add (class_);
162
162
_generatorBackend.generateClass (packageGraph, lib, class_);
163
163
164
- generateConstants (class_);
165
- generateConstructors (class_);
166
- generateInstanceMethods (class_);
167
- generateInstanceOperators (class_);
168
- generateInstanceProperties (class_);
169
- generateStaticMethods (class_);
170
- generateStaticProperties (class_);
164
+ var canonicalLibrary = class_.canonicalLibraryOrThrow;
165
+ generateConstants (class_, canonicalLibrary);
166
+ generateConstructors (class_, canonicalLibrary);
167
+ generateInstanceMethods (class_, canonicalLibrary);
168
+ generateInstanceOperators (class_, canonicalLibrary);
169
+ generateInstanceProperties (class_, canonicalLibrary);
170
+ generateStaticMethods (class_, canonicalLibrary);
171
+ generateStaticProperties (class_, canonicalLibrary);
171
172
}
172
173
173
- for (var extension in lib.extensions.whereDocumented ) {
174
+ for (var extension in lib.extensions.whereDocumentedIn (lib) ) {
174
175
indexAccumulator.add (extension );
175
176
_generatorBackend.generateExtension (packageGraph, lib, extension );
176
177
177
- generateConstants (extension );
178
- generateInstanceMethods (extension );
179
- generateInstanceOperators (extension );
180
- generateInstanceProperties (extension );
181
- generateStaticMethods (extension );
182
- generateStaticProperties (extension );
178
+ var canonicalLibrary = extension .canonicalLibraryOrThrow;
179
+ generateConstants (extension , canonicalLibrary);
180
+ generateInstanceMethods (extension , canonicalLibrary);
181
+ generateInstanceOperators (extension , canonicalLibrary);
182
+ generateInstanceProperties (extension , canonicalLibrary);
183
+ generateStaticMethods (extension , canonicalLibrary);
184
+ generateStaticProperties (extension , canonicalLibrary);
183
185
}
184
186
185
- for (var extensionType in lib.extensionTypes.whereDocumented ) {
187
+ for (var extensionType in lib.extensionTypes.whereDocumentedIn (lib) ) {
186
188
indexAccumulator.add (extensionType);
187
189
_generatorBackend.generateExtensionType (
188
190
packageGraph, lib, extensionType);
189
191
190
- generateConstants (extensionType);
191
- generateConstructors (extensionType);
192
- generateInstanceMethods (extensionType);
193
- generateInstanceOperators (extensionType);
194
- generateInstanceProperties (extensionType);
195
- generateStaticMethods (extensionType);
196
- generateStaticProperties (extensionType);
192
+ var canonicalLibrary = extensionType.canonicalLibraryOrThrow;
193
+ generateConstants (extensionType, canonicalLibrary);
194
+ generateConstructors (extensionType, canonicalLibrary);
195
+ generateInstanceMethods (extensionType, canonicalLibrary);
196
+ generateInstanceOperators (extensionType, canonicalLibrary);
197
+ generateInstanceProperties (extensionType, canonicalLibrary);
198
+ generateStaticMethods (extensionType, canonicalLibrary);
199
+ generateStaticProperties (extensionType, canonicalLibrary);
197
200
}
198
201
199
- for (var mixin in lib.mixins.whereDocumented ) {
202
+ for (var mixin in lib.mixins.whereDocumentedIn (lib) ) {
200
203
indexAccumulator.add (mixin );
201
204
_generatorBackend.generateMixin (packageGraph, lib, mixin );
202
205
203
- generateConstants (mixin );
204
- generateInstanceMethods (mixin );
205
- generateInstanceOperators (mixin );
206
- generateInstanceProperties (mixin );
207
- generateStaticMethods (mixin );
208
- generateStaticProperties (mixin );
206
+ var canonicalLibrary = mixin .canonicalLibraryOrThrow;
207
+ generateConstants (mixin , canonicalLibrary);
208
+ generateInstanceMethods (mixin , canonicalLibrary);
209
+ generateInstanceOperators (mixin , canonicalLibrary);
210
+ generateInstanceProperties (mixin , canonicalLibrary);
211
+ generateStaticMethods (mixin , canonicalLibrary);
212
+ generateStaticProperties (mixin , canonicalLibrary);
209
213
}
210
214
211
- for (var enum_ in lib.enums.whereDocumented ) {
215
+ for (var enum_ in lib.enums.whereDocumentedIn (lib) ) {
212
216
indexAccumulator.add (enum_);
213
217
_generatorBackend.generateEnum (packageGraph, lib, enum_);
214
218
215
- generateConstants (enum_);
216
- generateConstructors (enum_);
217
- generateInstanceMethods (enum_);
218
- generateInstanceOperators (enum_);
219
- generateInstanceProperties (enum_);
220
- generateStaticMethods (enum_);
221
- generateStaticProperties (enum_);
219
+ var canonicalLibrary = enum_.canonicalLibraryOrThrow;
220
+ generateConstants (enum_, canonicalLibrary);
221
+ generateConstructors (enum_, canonicalLibrary);
222
+ generateInstanceMethods (enum_, canonicalLibrary);
223
+ generateInstanceOperators (enum_, canonicalLibrary);
224
+ generateInstanceProperties (enum_, canonicalLibrary);
225
+ generateStaticMethods (enum_, canonicalLibrary);
226
+ generateStaticProperties (enum_, canonicalLibrary);
222
227
}
223
228
224
- for (var constant in lib.constants.whereDocumented ) {
229
+ for (var constant in lib.constants.whereDocumentedIn (lib) ) {
225
230
indexAccumulator.add (constant);
226
231
_generatorBackend.generateTopLevelProperty (
227
232
packageGraph, lib, constant);
228
233
}
229
234
230
- for (var property in lib.properties.whereDocumented ) {
235
+ for (var property in lib.properties.whereDocumentedIn (lib) ) {
231
236
indexAccumulator.add (property);
232
237
_generatorBackend.generateTopLevelProperty (
233
238
packageGraph, lib, property);
234
239
}
235
240
236
- for (var function in lib.functions.whereDocumented ) {
241
+ for (var function in lib.functions.whereDocumentedIn (lib) ) {
237
242
indexAccumulator.add (function);
238
243
_generatorBackend.generateFunction (packageGraph, lib, function);
239
244
}
240
245
241
- for (var typeDef in lib.typedefs.whereDocumented ) {
246
+ for (var typeDef in lib.typedefs.whereDocumentedIn (lib) ) {
242
247
indexAccumulator.add (typeDef);
243
248
_generatorBackend.generateTypeDef (packageGraph, lib, typeDef);
244
249
}
0 commit comments