fix issue

makhin · makhin · commit ce4722893c8c · 2021-09-08T14:33:25.000+02:00
fix templates
diff --git a/Generator/Generators/Generator.cs b/Generator/Generators/Generator.cs
@@ -199,6 +199,19 @@ public void LoadEnums()
                             filterKeyValuePair.Value.Enums.AddRange(enumerations);
                     }
                 }
+
+                foreach (var filterKeyValuePair in FilterList.GetFilters())
+                {
+                    var filter = filterKeyValuePair.Value;
+                    foreach (var enumeration in filter.Enums)
+                    {
+                        filter.UpdateEnum(enumeration);
+                        foreach (var enumerationMember in enumeration.Items)
+                        {
+                            filter.UpdateEnumMember(enumerationMember);
+                        }
+                    }
+                }
             }
             catch (Exception x)
             {
@@ -416,15 +429,6 @@ private void AddTablesToFilters(List<RawTable> rawTables)
 
                     table.Suffix = Settings.TableSuffix;
                 }
-
-                foreach (var enumeration in filter.Enums)
-                {
-                    filter.UpdateEnum(enumeration);
-                    foreach (var enumerationMember in enumeration.Items)
-                    {
-                        filter.UpdateEnumMember(enumerationMember);
-                    }
-                }
             }
         }
 
diff --git a/Generator/Templates/TemplateEf6.cs b/Generator/Templates/TemplateEf6.cs
@@ -1288,13 +1288,13 @@ public override string Enums()
         {
             return @"
 {{#each EnumAttributes}}
-    {{this}}{{#newline}}
+{{this}}{{#newline}}
 {{/each}}
 public enum {{EnumName}}{{#newline}}
 {{{#newline}}
 {{#each Items}}
     {{#each Attributes}}
-        {{this}}{{#newline}}
+    {{this}}{{#newline}}
     {{/each}}
     {{Key}} = {{Value}},{{#newline}}
 {{/each}}
diff --git a/Generator/Templates/TemplateEfCore2.cs b/Generator/Templates/TemplateEfCore2.cs
@@ -1349,13 +1349,13 @@ public override string Enums()
         {
             return @"
 {{#each EnumAttributes}}
-    {{this}}{{#newline}}
+{{this}}{{#newline}}
 {{/each}}
 public enum {{EnumName}}{{#newline}}
 {{{#newline}}
 {{#each Items}}
     {{#each Attributes}}
-        {{this}}{{#newline}}
+    {{this}}{{#newline}}
     {{/each}}
     {{Key}} = {{Value}},{{#newline}}
 {{/each}}
diff --git a/Generator/Templates/TemplateEfCore3.cs b/Generator/Templates/TemplateEfCore3.cs
@@ -1469,13 +1469,13 @@ public override string Enums()
         {
             return @"
 {{#each EnumAttributes}}
-    {{this}}{{#newline}}
+{{this}}{{#newline}}
 {{/each}}
 public enum {{EnumName}}{{#newline}}
 {{{#newline}}
 {{#each Items}}
     {{#each Attributes}}
-        {{this}}{{#newline}}
+    {{this}}{{#newline}}
     {{/each}}
     {{Key}} = {{Value}},{{#newline}}
 {{/each}}
diff --git a/Generator/Templates/TemplateEfCore5.cs b/Generator/Templates/TemplateEfCore5.cs
@@ -1446,13 +1446,13 @@ public override string Enums()
         {
             return @"
 {{#each EnumAttributes}}
-    {{this}}{{#newline}}
+{{this}}{{#newline}}
 {{/each}}
 public enum {{EnumName}}{{#newline}}
 {{{#newline}}
 {{#each Items}}
     {{#each Attributes}}
-        {{this}}{{#newline}}
+    {{this}}{{#newline}}
     {{/each}}
     {{Key}} = {{Value}},{{#newline}}
 {{/each}}
diff --git a/Tester.Integration.EfCore3/File based templates/Templates.EF6/Enums.mustache b/Tester.Integration.EfCore3/File based templates/Templates.EF6/Enums.mustache
@@ -6,7 +6,7 @@ public enum {{EnumName}}{{#newline}}
 #newline}}
 {{#each Items}}
     {{#each Attributes}}
-        {{this}}{{#newline}}
+    {{this}}{{#newline}}
     {{/each}}
     {{Key}} = {{Value}},{{#newline}}
 {{/each}}
diff --git a/Tester.Integration.EfCore3/File based templates/Templates.EFCore3/Enums.mustache b/Tester.Integration.EfCore3/File based templates/Templates.EFCore3/Enums.mustache
@@ -6,7 +6,7 @@ public enum {{EnumName}}{{#newline}}
 #newline}}
 {{#each Items}}
     {{#each Attributes}}
-        {{this}}{{#newline}}
+    {{this}}{{#newline}}
     {{/each}}
     {{Key}} = {{Value}},{{#newline}}
 {{/each}}

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,19 @@ public void LoadEnums()`
`199`	`199`	`filterKeyValuePair.Value.Enums.AddRange(enumerations);`
`200`	`200`	`}`
`201`	`201`	`}`
	`202`	`+`
	`203`	`+ foreach (var filterKeyValuePair in FilterList.GetFilters())`
	`204`	`+ {`
	`205`	`+ var filter = filterKeyValuePair.Value;`
	`206`	`+ foreach (var enumeration in filter.Enums)`
	`207`	`+ {`
	`208`	`+ filter.UpdateEnum(enumeration);`
	`209`	`+ foreach (var enumerationMember in enumeration.Items)`
	`210`	`+ {`
	`211`	`+ filter.UpdateEnumMember(enumerationMember);`
	`212`	`+ }`
	`213`	`+ }`
	`214`	`+ }`
`202`	`215`	`}`
`203`	`216`	`catch (Exception x)`
`204`	`217`	`{`
`@@ -416,15 +429,6 @@ private void AddTablesToFilters(List<RawTable> rawTables)`
`416`	`429`
`417`	`430`	`table.Suffix = Settings.TableSuffix;`
`418`	`431`	`}`
`419`		`-`
`420`		`- foreach (var enumeration in filter.Enums)`
`421`		`- {`
`422`		`- filter.UpdateEnum(enumeration);`
`423`		`- foreach (var enumerationMember in enumeration.Items)`
`424`		`- {`
`425`		`- filter.UpdateEnumMember(enumerationMember);`
`426`		`- }`
`427`		`- }`
`428`	`432`	`}`
`429`	`433`	`}`
`430`	`434`