Skip to content

Commit 751b12e

Browse files
committed
fixed OnBeforeGeneration and OnBeforeBarrelGeneration logic
1 parent b233f17 commit 751b12e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/TypeGen/TypeGen.Core/Generator/Generator.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,13 @@ public IEnumerable<string> Generate(IEnumerable<GenerationSpec> generationSpecs)
145145

146146
// generate types
147147

148+
foreach (GenerationSpec generationSpec in generationSpecs)
149+
generationSpec.OnBeforeGeneration(new OnBeforeGenerationArgs(Options));
150+
148151
foreach (GenerationSpec generationSpec in generationSpecs)
149152
{
150153
_metadataReaderFactory.GenerationSpec = generationSpec;
151-
generationSpec.OnBeforeGeneration(new OnBeforeGenerationArgs(Options));
152-
154+
153155
foreach (KeyValuePair<Type, TypeSpec> kvp in generationSpec.TypeSpecs)
154156
files.AddRange(GenerateMarkedType(kvp.Key));
155157
}
@@ -158,12 +160,12 @@ public IEnumerable<string> Generate(IEnumerable<GenerationSpec> generationSpecs)
158160

159161
// generate barrels
160162

161-
if (Options.CreateIndexFile)
162-
files.AddRange(GenerateIndexFile(files));
163-
164163
foreach (GenerationSpec generationSpec in generationSpecs)
165164
generationSpec.OnBeforeBarrelGeneration(new OnBeforeBarrelGenerationArgs(Options, files.ToList()));
166165

166+
if (Options.CreateIndexFile)
167+
files.AddRange(GenerateIndexFile(files));
168+
167169
foreach (GenerationSpec generationSpec in generationSpecs)
168170
foreach (BarrelSpec barrelSpec in generationSpec.BarrelSpecs)
169171
files.AddRange(GenerateBarrel(barrelSpec));

0 commit comments

Comments
 (0)