Add support for ObjCEnum.EntryName by stefanhaustein · Pull Request #5683 · JetBrains/kotlin

stefanhaustein · 2026-02-09T13:25:40Z

Allowing NSEnum-specific names, simplifying compatibility when porting code to Kotlin

This is a refinement for https://youtrack.jetbrains.com/issue/KT-48068/

Renaming via ObjCName requires escaping of the enum entry name, leading to unnecessarily escaped names for the fully qualified enum literal name
There are cases where we need specific names for the literals that are different from the objc entry object names

libraries/stdlib/src/kotlin/annotations/NativeAnnotations.kt

.../objcexport-header-generator/testData/headers/enumClassWithObjCEnumAndRenamedLiterals/Foo.kt

...a/headers/enumClassWithObjCEnumAndRenamedLiterals/!enumClassWithObjCEnumAndRenamedLiterals.h

...eader-generator/impl/k1/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt

...-generator/impl/k1/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslator.kt

SvyatoslavScherbina

Everything else LGTM.
Please also squash the commits and write a commit message following the guideline: https://github.com/JetBrains/kotlin/blob/master/docs/code_authoring_and_core_review.md#commit-messages-and-yt-tickets

libraries/stdlib/src/kotlin/annotations/NativeAnnotations.kt

...eader-generator/impl/k1/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt

kotlin-safe-merge · 2026-02-19T17:13:38Z

Code Owners

Rule	Owners	Approval
`/kotlin-native/runtime/src/main/kotlin/`	`@DmitryNekrasov`, kotlin-native, `@fzhinkin`, `@ilya-g`, `@qwwdfsad`	✅
`/libraries/stdlib/`	`@DmitryNekrasov`, `@fzhinkin`, `@ilya-g`, `@qwwdfsad`	❌
`/libraries/tools/binary-compatibility-validator/`	kotlin-libraries	❌
`/native/`, `/native/objcexport-header-generator/impl/analysis-api/`, `/native/objcexport-header-generator/`	kotlin-native	✅

SvyatoslavScherbina · 2026-02-19T17:13:48Z

/test-public

SvyatoslavScherbina · 2026-02-20T08:39:30Z

You also need to run the "Test: public API binary compatibility validator w/Native, overwrite results" run configuration from IDEA, or

./gradlew :tools:binary-compatibility-validator:cleanTest :tools:binary-compatibility-validator:test --tests '*' -Poverwrite.output=true -Pkotlin.native.enabled=true

in the terminal.

stefanhaustein · 2026-02-20T15:57:53Z

Everything else LGTM. Please also squash the commits and write a commit message following the guideline: https://github.com/JetBrains/kotlin/blob/master/docs/code_authoring_and_core_review.md#commit-messages-and-yt-tickets

Do you have a recommendation / pointer for the best way to squash / how you typically do this?

Github documentation only points at selecting this as a merge option
I have tried git rebase -i HEAD~6, but it gave me a list of hundreds of commits. I tried to nope out but I am slightly concerned I might have put my client into a bad state

SvyatoslavScherbina

Everything else LGTM. Please also squash the commits and write a commit message following the guideline: https://github.com/JetBrains/kotlin/blob/master/docs/code_authoring_and_core_review.md#commit-messages-and-yt-tickets

Do you have a recommendation / pointer for the best way to squash / how you typically do this?

With git rebase -i.

I have tried git rebase -i HEAD~6, but it gave me a list of hundreds of commits. I tried to nope out but I am slightly concerned I might have put my client into a bad state

I guess it happened because you merged from the upstream instead of rebasing to it.
To remove merge commits, you can rebase to the upstream.

SvyatoslavScherbina · 2026-02-20T17:49:14Z

/test-public

…y of the (translated) names for the regular enum transpilation. The entry names are supplied via @ObjCEnum.EntryName. This amends [KT-48068], simplifying migrations where compatibility needs to be ensure for legacy code ported to kotlin.

stefanhaustein · 2026-02-23T11:46:22Z

Everything else LGTM. Please also squash the commits and write a commit message following the guideline: https://github.com/JetBrains/kotlin/blob/master/docs/code_authoring_and_core_review.md#commit-messages-and-yt-tickets

This should be done now

SvyatoslavScherbina

/test-public

SvyatoslavScherbina · 2026-03-02T14:20:11Z

/test-public

stefanhaustein requested review from a team, DmitryNekrasov, fzhinkin, ilya-g and qwwdfsad as code owners February 9, 2026 13:25

stefanhaustein requested a review from mMaxy February 9, 2026 13:25

SvyatoslavScherbina reviewed Feb 10, 2026

View reviewed changes

SvyatoslavScherbina removed the request for review from mMaxy February 10, 2026 17:17

stefanhaustein requested a review from SvyatoslavScherbina February 13, 2026 10:10

SvyatoslavScherbina reviewed Feb 19, 2026

View reviewed changes

SvyatoslavScherbina reviewed Feb 20, 2026

View reviewed changes

stefanhaustein force-pushed the master branch from c51a89d to 39f1623 Compare February 23, 2026 11:27

stefanhaustein force-pushed the master branch from 39f1623 to 126b073 Compare February 23, 2026 11:45

SvyatoslavScherbina approved these changes Mar 2, 2026

View reviewed changes

Conversation

stefanhaustein commented Feb 9, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SvyatoslavScherbina left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kotlin-safe-merge bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Owners

Uh oh!

SvyatoslavScherbina commented Feb 19, 2026

Uh oh!

SvyatoslavScherbina commented Feb 20, 2026

Uh oh!

stefanhaustein commented Feb 20, 2026

Uh oh!

SvyatoslavScherbina left a comment

Choose a reason for hiding this comment

Uh oh!

SvyatoslavScherbina commented Feb 20, 2026

Uh oh!

stefanhaustein commented Feb 23, 2026

Uh oh!

SvyatoslavScherbina left a comment

Choose a reason for hiding this comment

Uh oh!

SvyatoslavScherbina commented Mar 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kotlin-safe-merge bot commented Feb 19, 2026 •

edited

Loading