special handling for java property accessors override checking

(cherry picked from commit 4785305)
google · May 17, 2024 · 31c5d7c · 31c5d7c
1 parent cd68e48
commit 31c5d7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt b/...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt
@@ -107,7 +107,11 @@ class KSFunctionDeclarationImpl private constructor(internal val ktFunctionSymbo
         }
         recordLookupForPropertyOrMethod(this)
         return analyze {
-            ktFunctionSymbol.getDirectlyOverriddenSymbols().firstOrNull()?.unwrapFakeOverrides?.toKSDeclaration()
+            if (ktFunctionSymbol is KtPropertyAccessorSymbol) {
+                (parentDeclaration as? KSPropertyDeclarationImpl)?.ktPropertySymbol
+            } else {
+                ktFunctionSymbol
+            }?.getDirectlyOverriddenSymbols()?.firstOrNull()?.unwrapFakeOverrides?.toKSDeclaration()
         }?.also { recordLookupForPropertyOrMethod(it) }
     }
 

diff --git a/...c/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyDeclarationJavaImpl.kt b/...c/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyDeclarationJavaImpl.kt
@@ -1,11 +1,8 @@
 package com.google.devtools.ksp.impl.symbol.kotlin
 
-import com.google.devtools.ksp.closestClassDeclaration
 import com.google.devtools.ksp.common.KSObjectCache
 import com.google.devtools.ksp.common.impl.KSNameImpl
 import com.google.devtools.ksp.impl.ResolverAAImpl
-import com.google.devtools.ksp.impl.recordLookupForPropertyOrMethod
-import com.google.devtools.ksp.impl.recordLookupWithSupertypes
 import com.google.devtools.ksp.impl.symbol.kotlin.resolved.KSTypeReferenceResolvedImpl
 import com.google.devtools.ksp.symbol.*
 import org.jetbrains.kotlin.analysis.api.symbols.KtJavaFieldSymbol
@@ -44,12 +41,7 @@ class KSPropertyDeclarationJavaImpl private constructor(val ktJavaFieldSymbol: K
     }
 
     override fun findOverridee(): KSPropertyDeclaration? {
-        closestClassDeclaration()?.asStarProjectedType()?.let {
-            recordLookupWithSupertypes((it as KSTypeImpl).type)
-        }
-        recordLookupForPropertyOrMethod(this)
-        TODO("Not yet implemented")
-        // ?.also { recordLookupForPropertyOrMethod(it) }
+        return null
     }
 
     override fun asMemberOf(containing: KSType): KSType {

diff --git a/test-utils/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt b/test-utils/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt
@@ -410,7 +410,6 @@ class KSPAATest : AbstractKSPAATest() {
         runTest("../test-utils/testData/api/overridee/conflictingOverride.kt")
     }
 
-    @Disabled
     @TestMetadata("javaAccessor.kt")
     @Test
     fun testJavaAccessor() {