Skip to content

Commit b181942

Browse files
committed
Fix block scoping on enum and iid generators
1 parent 34c939d commit b181942

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

LDtk.Codegen/Generators/EnumGenerator.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ public void Generate()
2828

2929
void GenEnum(EnumDefinition e)
3030
{
31-
Line($"namespace {options.Namespace};");
31+
if (options.BlockScopeNamespace)
32+
{
33+
Line($"namespace {options.Namespace}");
34+
StartBlock();
35+
}
36+
else
37+
{
38+
Line($"namespace {options.Namespace};");
39+
}
40+
3241
Blank();
3342
Line($"#pragma warning disable");
3443
Line($"public enum {e.Identifier}");
@@ -38,6 +47,12 @@ void GenEnum(EnumDefinition e)
3847
Line($"{value.Id},");
3948
}
4049
EndBlock();
50+
51+
if (options.BlockScopeNamespace)
52+
{
53+
EndBlock();
54+
}
55+
4156
Line($"#pragma warning restore");
4257

4358
Output(options, "Enums", e.Identifier);

LDtk.Codegen/Generators/IidGenerator.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@ public IidGenerator(LDtkFile ldtkFile, Options options)
1515

1616
public void Generate()
1717
{
18-
Line($"namespace {options.Namespace};");
18+
if (options.BlockScopeNamespace)
19+
{
20+
Line($"namespace {options.Namespace}");
21+
StartBlock();
22+
}
23+
else
24+
{
25+
Line($"namespace {options.Namespace};");
26+
}
27+
1928
Blank();
2029
Line($"#pragma warning disable");
2130
Line($"public static class Worlds");
@@ -33,6 +42,12 @@ public void Generate()
3342
EndBlock();
3443
}
3544
EndBlock();
45+
46+
if (options.BlockScopeNamespace)
47+
{
48+
EndBlock();
49+
}
50+
3651
Line($"#pragma warning restore");
3752

3853
Output(options, "Iids", "Worlds");

0 commit comments

Comments
 (0)