Skip to content

Postpone static field's companion resolution #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Add incremental validation
merged 3 commits into from
Jul 9, 2024
Merged

Postpone static field's companion resolution #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1f2ceb
Postpone static field's companion resolution
fzhinkin Jul 8, 2024
6d828f1
Fixed a typo
fzhinkin Jul 8, 2024
185c2ad
Don't register the companion class at all
fzhinkin Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/kotlin/api/KotlinSignaturesLoading.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ private fun FieldNode.buildFieldSignature(
foundAnnotations.addAll(companionClass?.visibleAnnotations.orEmpty())
foundAnnotations.addAll(companionClass?.invisibleAnnotations.orEmpty())
} else if (isStatic(access) && isFinal(access)) {
companionClass = ownerClass.companionName(ownerClass.kotlinMetadata)?.let {
val companionClassCandidate = ownerClass.companionName(ownerClass.kotlinMetadata)?.let {
classes[it]
}

val property = companionClass?.kmProperty(name)
val property = companionClassCandidate?.kmProperty(name)

if (property != null && JvmFlag.Property.IS_MOVED_FROM_INTERFACE_COMPANION(property.flags)) {
/*
Expand All @@ -140,7 +140,11 @@ private fun FieldNode.buildFieldSignature(
*
* See https://github.com/Kotlin/binary-compatibility-validator/issues/90
*/
foundAnnotations.addAll(companionClass!!.methods.annotationsFor(property.syntheticMethodForAnnotations))
foundAnnotations.addAll(
companionClassCandidate.methods.annotationsFor(
property.syntheticMethodForAnnotations
)
)
}
}

Expand Down
12 changes: 12 additions & 0 deletions src/test/kotlin/cases/enums/EnumWithInternalCompanion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* Copyright 2016-2024 JetBrains s.r.o.
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
*/

package cases.enums

public enum class EnumWithInternalCompanion {
A, B;

internal companion object
}
8 changes: 8 additions & 0 deletions src/test/kotlin/cases/enums/enums.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ public final class cases/enums/EnumClass : java/lang/Enum {
public static fun values ()[Lcases/enums/EnumClass;
}

public final class cases/enums/EnumWithInternalCompanion : java/lang/Enum {
public static final field A Lcases/enums/EnumWithInternalCompanion;
public static final field B Lcases/enums/EnumWithInternalCompanion;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lcases/enums/EnumWithInternalCompanion;
public static fun values ()[Lcases/enums/EnumWithInternalCompanion;
}

public final class cases/enums/JavaEnum : java/lang/Enum {
public static final field JA Lcases/enums/JavaEnum;
public static final field JB Lcases/enums/JavaEnum;
Expand Down