Fix for extensions that override enums - refs #83

vojtechhabarta · vojtechhabarta · commit d3c8a939f38d · 2016-10-04T17:17:40.000+02:00
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/Emitter.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/Emitter.java
@@ -181,7 +181,7 @@ private void emitTypeAliases(TsModel model, boolean exportKeyword) {
     }
 
     private void emitNumberEnums(TsModel model, boolean exportKeyword, boolean declareKeyword) {
-        final ArrayList<TsEnumModel<?>> enums = settings.mapEnum == EnumMapping.asNumberBasedEnum
+        final ArrayList<TsEnumModel<?>> enums = settings.mapEnum == EnumMapping.asNumberBasedEnum && !settings.areDefaultStringEnumsOverriddenByExtension()
                 ? new ArrayList<>(model.getEnums())
                 : new ArrayList<TsEnumModel<?>>(model.getEnums(EnumKind.NumberBased));
         if (settings.sortDeclarations || settings.sortTypeDeclarations) {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private void emitTypeAliases(TsModel model, boolean exportKeyword) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`private void emitNumberEnums(TsModel model, boolean exportKeyword, boolean declareKeyword) {`
`184`		`- final ArrayList<TsEnumModel<?>> enums = settings.mapEnum == EnumMapping.asNumberBasedEnum`
	`184`	`+ final ArrayList<TsEnumModel<?>> enums = settings.mapEnum == EnumMapping.asNumberBasedEnum && !settings.areDefaultStringEnumsOverriddenByExtension()`
`185`	`185`	`? new ArrayList<>(model.getEnums())`
`186`	`186`	`: new ArrayList<TsEnumModel<?>>(model.getEnums(EnumKind.NumberBased));`
`187`	`187`	`if (settings.sortDeclarations \|\| settings.sortTypeDeclarations) {`