diff --git a/packages/quicktype-core/src/language/Kotlin/KotlinRenderer.ts b/packages/quicktype-core/src/language/Kotlin/KotlinRenderer.ts index 963b68b54..e79d83e12 100644 --- a/packages/quicktype-core/src/language/Kotlin/KotlinRenderer.ts +++ b/packages/quicktype-core/src/language/Kotlin/KotlinRenderer.ts @@ -57,9 +57,9 @@ export class KotlinRenderer extends ConvenienceRenderer { protected forbiddenForEnumCases( _e: EnumType, - _enumName: Name, + enumName: Name, ): ForbiddenWordsInfo { - return { names: [], includeGlobalForbidden: true }; + return { names: [enumName], includeGlobalForbidden: true }; } protected forbiddenForUnionMembers( diff --git a/test/fixtures.ts b/test/fixtures.ts index 1ecbfabbe..1be4f8ee1 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -698,6 +698,7 @@ const skipTypeScriptTests = [ "optional-union.json", "pokedex.json", // Enums are screwed up: https://github.com/YousefED/typescript-json-schema/issues/186 "github-events.json", + "kotlin-enum-class-case-collision.json", "bug855-short.json", "bug863.json", "00c36.json", diff --git a/test/inputs/json/priority/kotlin-enum-class-case-collision.json b/test/inputs/json/priority/kotlin-enum-class-case-collision.json new file mode 100644 index 000000000..6fe2377c1 --- /dev/null +++ b/test/inputs/json/priority/kotlin-enum-class-case-collision.json @@ -0,0 +1,22 @@ +[ + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" }, + { "category": " " }, + { "category": "" } +] diff --git a/test/languages.ts b/test/languages.ts index ecbe724ee..412635ae8 100644 --- a/test/languages.ts +++ b/test/languages.ts @@ -1582,6 +1582,7 @@ export const KotlinXLanguage: Language = { // Top-level arrays render as `typealias TopLevel = JsonArray`, // which doesn't compile — kotlinx's JsonArray takes no type // arguments (documented TODO in KotlinXRenderer.ts). + "kotlin-enum-class-case-collision.json", "bug863.json", "github-events.json", "optional-union.json",