From 5c69d38b672b48fc494acd67c5fd59c33a51f027 Mon Sep 17 00:00:00 2001 From: Denis Buzmakov Date: Thu, 22 Oct 2026 00:08:45 +0200 Subject: [PATCH] Use underlying Java methods for synthetic Java property accessors --- .../symbol/kotlin/KSClassDeclarationImpl.kt | 11 ++++------- .../symbol/kotlin/KSFunctionDeclarationImpl.kt | 11 +++++++++-- .../ksp/test/AAConfiguredUnitTestSuite.kt | 12 ------------ .../devtools/ksp/test/KSPUnitTestSuite.kt | 18 ++++++++++++------ .../ksp/test/PsiConfiguredUnitTestSuite.kt | 12 ------------ .../testData/declarationsInClass.kt | 15 +++++++++------ .../testData/javaSubtypeOfKotlinInterface.kt | 2 -- .../processor/DeclarationsInClassProcessor.kt | 6 +----- 8 files changed, 35 insertions(+), 52 deletions(-) diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt index c07b7a9ce8..82839df5e4 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt @@ -273,16 +273,13 @@ class KSClassDeclarationImpl private constructor(internal val ktClassOrObjectSym return if ((origin == Origin.JAVA || origin == Origin.JAVA_LIB) && classKind != ClassKind.ANNOTATION_CLASS) { decls.flatMap { decl -> if (decl is KSPropertyDeclarationImpl && decl.ktPropertySymbol is KaSyntheticJavaPropertySymbol) { - sequenceOf(decl.getter, decl.setter).mapNotNull { accessor -> - KSFunctionDeclarationImpl.getCached( - (accessor as? KSPropertyAccessorImpl)?.ktPropertyAccessorSymbol - ?: return@mapNotNull null - ) - } + sequenceOf(decl.ktPropertySymbol.javaGetterSymbol, decl.ktPropertySymbol.javaSetterSymbol) + .filterNotNull() + .map { KSFunctionDeclarationImpl.getCached(it) } } else { sequenceOf(decl) } - } + }.distinct() } else decls } diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt index 1acbe89972..4f81b0973b 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt @@ -65,6 +65,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolLocation import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolModality import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolOrigin import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolVisibility +import org.jetbrains.kotlin.analysis.api.symbols.KaSyntheticJavaPropertySymbol import org.jetbrains.kotlin.analysis.api.symbols.contextParameters import org.jetbrains.kotlin.analysis.api.symbols.name import org.jetbrains.kotlin.analysis.api.symbols.receiverType @@ -467,7 +468,7 @@ fun KaSession.findKaFunctionSymbol(psiMethod: PsiMethod, parentClass: KSClassDec private fun KaSession.findKaPropertyAccessorSymbols( psiMethod: PsiMethod, parentClass: KSClassDeclarationImpl -): Sequence { +): Sequence { val methodName = psiMethod.name val namesToSearch = when { // A standard Java getter like `getFoo()` overrides a Kotlin property named `foo` or `Foo`. @@ -496,7 +497,13 @@ private fun KaSession.findKaPropertyAccessorSymbols( return namesToSearch .flatMap { parentClass.ktClassOrObjectSymbol.memberScope.callables(Name.identifier(it)) } .filterIsInstance() - .flatMap { sequenceOf(it.getter, it.setter) } + .flatMap { + if (it is KaSyntheticJavaPropertySymbol) { + sequenceOf(it.javaGetterSymbol, it.javaSetterSymbol) + } else { + sequenceOf(it.getter, it.setter) + } + } .filterNotNull() } diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/AAConfiguredUnitTestSuite.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/AAConfiguredUnitTestSuite.kt index 541ad34422..9daf3fcd9d 100644 --- a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/AAConfiguredUnitTestSuite.kt +++ b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/AAConfiguredUnitTestSuite.kt @@ -37,18 +37,6 @@ abstract class AAConfiguredUnitTestSuiteBase( override fun testGroupedAnnotationsWithUseSiteTargets() { runKSPTest("getSymbolsWithAnnotation/groupedAnnotationsWithUseSiteTargets.kt") } - - @TestMetadata("functionKindsJavaInheritsKotlin.kt") - @Test - override fun testFunctionKindsJavaInheritsKotlin() { - runThrowingKSPTest("functionKindsJavaInheritsKotlin.kt") - } - - @TestMetadata("javaSubtypeOfKotlinInterface.kt") - @Test - override fun testJavaSubtypeOfKotlinInterface() { - runKSPTest("javaSubtypeOfKotlinInterface.kt") - } } class AAConfiguredDefaultFeaturesUnitTestSuite : AAConfiguredUnitTestSuiteBase( diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt index 647fa9479f..11b6974f32 100644 --- a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt +++ b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPUnitTestSuite.kt @@ -504,9 +504,12 @@ abstract class KSPUnitTestSuite( runKSPTest("functionKinds.kt") } - @Bug("https://github.com/google/ksp/issues/2496", BugState.OPEN) + @Bug("https://github.com/google/ksp/issues/2496", BugState.FIXED) @TestMetadata("functionKindsJavaInheritsKotlin.kt") - abstract fun testFunctionKindsJavaInheritsKotlin() + @Test + fun testFunctionKindsJavaInheritsKotlin() { + runKSPTest("functionKindsJavaInheritsKotlin.kt") + } @TestMetadata("getAnnotationByTypeWithInnerDefault.kt") @Test @@ -638,9 +641,12 @@ abstract class KSPUnitTestSuite( runKSPTest("javaSubtype.kt") } - @Bug("https://github.com/google/ksp/issues/2925", BugState.OPEN) + @Bug("https://github.com/google/ksp/issues/2925", BugState.FIXED) @TestMetadata("javaSubtypeOfKotlinInterface.kt") - abstract fun testJavaSubtypeOfKotlinInterface() + @Test + fun testJavaSubtypeOfKotlinInterface() { + runKSPTest("javaSubtypeOfKotlinInterface.kt") + } @TestMetadata("javaToKotlinMapper.kt") @Test @@ -840,11 +846,11 @@ abstract class KSPUnitTestSuite( runKSPTest("parameterTypes.kt") } - @Bug("https://github.com/google/ksp/issues/2498", BugState.OPEN) + @Bug("https://github.com/google/ksp/issues/2498", BugState.FIXED) @TestMetadata("parentOfJavaMethodOverridingKotlinProperty.kt") @Test fun testParentOfJavaMethodOverridingKotlinProperty() { - runFailingKSPTest("parentOfJavaMethodOverridingKotlinProperty.kt") + runKSPTest("parentOfJavaMethodOverridingKotlinProperty.kt") } @TestMetadata("parent.kt") diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/PsiConfiguredUnitTestSuite.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/PsiConfiguredUnitTestSuite.kt index c6bd88d533..939b442b28 100644 --- a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/PsiConfiguredUnitTestSuite.kt +++ b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/PsiConfiguredUnitTestSuite.kt @@ -32,18 +32,6 @@ abstract class PsiConfiguredUnitTestSuiteBase( runKSPTest("getSymbolsWithAnnotation/negative/allUseSiteTargetAppliedToAnnotationList.kt") } - @TestMetadata("functionKindsJavaInheritsKotlin.kt") - @Test - override fun testFunctionKindsJavaInheritsKotlin() { - runFailingKSPTest("functionKindsJavaInheritsKotlin.kt") - } - - @TestMetadata("javaSubtypeOfKotlinInterface.kt") - @Test - override fun testJavaSubtypeOfKotlinInterface() { - runFailingKSPTest("javaSubtypeOfKotlinInterface.kt") - } - @TestMetadata("getSymbolsWithAnnotation/groupedAnnotationsWithUseSiteTargets.kt") @Test override fun testGroupedAnnotationsWithUseSiteTargets() { diff --git a/kotlin-analysis-api/testData/declarationsInClass.kt b/kotlin-analysis-api/testData/declarationsInClass.kt index 8778d384b1..16a5974100 100644 --- a/kotlin-analysis-api/testData/declarationsInClass.kt +++ b/kotlin-analysis-api/testData/declarationsInClass.kt @@ -26,6 +26,7 @@ // CLASS: lib.CustomMap (JAVA_LIB) // CLASS: lib.InterfaceWithNonObjectMethodOverrides (JAVA_LIB) // CLASS: lib.InterfaceWithObjectMethodOverrides (JAVA_LIB) +// CLASS: lib.OverridesBaseWithCapitalizedProperties (JAVA_LIB) // CLASS: lib.OverridesBaseWithIsProperties (JAVA_LIB) // CLASS: lib.OverridesBaseWithProperties (JAVA_LIB) // CLASS: lib.StaticVsMemberDeclarations (JAVA_LIB) @@ -37,6 +38,7 @@ // CONSTRUCTOR: CustomMap. (JAVA_LIB) // CONSTRUCTOR: InnerC. (JAVA_LIB) // CONSTRUCTOR: NestedC. (JAVA_LIB) +// CONSTRUCTOR: OverridesBaseWithCapitalizedProperties. (JAVA_LIB) // CONSTRUCTOR: OverridesBaseWithIsProperties. (JAVA_LIB) // CONSTRUCTOR: OverridesBaseWithProperties. (JAVA_LIB) // CONSTRUCTOR: StaticVsMemberDeclarations. (JAVA_LIB) @@ -48,14 +50,15 @@ // FUNCTION: ConcreteClassWithObjectMethodOverrides.toString (JAVA_LIB) // FUNCTION: CustomList.get (JAVA_LIB) // FUNCTION: CustomList.removeAt (JAVA_LIB) -// FUNCTION: CustomList.size (SYNTHETIC) -// FUNCTION: CustomMap.entrySet (SYNTHETIC) +// FUNCTION: CustomList.size (JAVA_LIB) +// FUNCTION: CustomMap.entrySet (JAVA_LIB) // FUNCTION: InterfaceWithNonObjectMethodOverrides.equals (JAVA_LIB) // FUNCTION: InterfaceWithNonObjectMethodOverrides.someMethod (JAVA_LIB) -// FUNCTION: OverridesBaseWithIsProperties.getFoo (SYNTHETIC) -// FUNCTION: OverridesBaseWithIsProperties.isBar (SYNTHETIC) -// FUNCTION: OverridesBaseWithProperties.getFoo (SYNTHETIC) -// FUNCTION: OverridesBaseWithProperties.getGetBar (SYNTHETIC) +// FUNCTION: OverridesBaseWithCapitalizedProperties.getFoo (JAVA_LIB) +// FUNCTION: OverridesBaseWithIsProperties.getFoo (JAVA_LIB) +// FUNCTION: OverridesBaseWithIsProperties.isBar (JAVA_LIB) +// FUNCTION: OverridesBaseWithProperties.getFoo (JAVA_LIB) +// FUNCTION: OverridesBaseWithProperties.getGetBar (JAVA_LIB) // FUNCTION: OverridesBaseWithProperties.getNonProperty (JAVA_LIB) // GETTER: BaseWithCapitalizedProperties.Foo (KOTLIN_LIB) // GETTER: BaseWithIsProperties.foo (KOTLIN_LIB) diff --git a/kotlin-analysis-api/testData/javaSubtypeOfKotlinInterface.kt b/kotlin-analysis-api/testData/javaSubtypeOfKotlinInterface.kt index 9706951d50..89e61efa1f 100644 --- a/kotlin-analysis-api/testData/javaSubtypeOfKotlinInterface.kt +++ b/kotlin-analysis-api/testData/javaSubtypeOfKotlinInterface.kt @@ -22,8 +22,6 @@ // Declaration qualifiedName: MyInterface.Foo (Origin: KOTLIN) // Declaration simpleName: getFoo // Declaration qualifiedName: MyClass.getFoo (Origin: JAVA) -// Declaration simpleName: getFoo -// Declaration qualifiedName: MyClass.getFoo (Origin: SYNTHETIC) // Declaration simpleName: // END diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DeclarationsInClassProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DeclarationsInClassProcessor.kt index 3a8341fed1..5dda5ffef4 100644 --- a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DeclarationsInClassProcessor.kt +++ b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DeclarationsInClassProcessor.kt @@ -77,11 +77,7 @@ class DeclarationsInClassProcessor(override val apiFeatures: ApiFeatures): Abstr processDeclaration(resolver.getClassDeclarationByName("lib.BaseWithIsProperties")!!) processDeclaration(resolver.getClassDeclarationByName("lib.OverridesBaseWithIsProperties")!!) processDeclaration(resolver.getClassDeclarationByName("lib.BaseWithCapitalizedProperties")!!) - // TODO(https://github.com/google/ksp/issues/2925): Enable this once we've sorted out the differences between - // the AA and PSI implementations. Currently, the main issue is that for the case where a property is - // capitalized and a Java method overrides the getter, the AA implementation includes both the original Java - // method and the synthetic accessor method; whereas the PSI implementation only includes the original method. - // processDeclaration(resolver.getClassDeclarationByName("lib.OverridesBaseWithCapitalizedProperties")!!) + processDeclaration(resolver.getClassDeclarationByName("lib.OverridesBaseWithCapitalizedProperties")!!) processDeclaration(resolver.getClassDeclarationByName("lib.StaticVsMemberDeclarations")!!) return emptyList() }