use proper scope for getting declared static memberscope

google · Apr 3, 2024 · 88b78d4 · 88b78d4
1 parent d87c083
commit 88b78d4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
@@ -231,7 +231,7 @@ internal inline fun <R> analyze(crossinline action: KtAnalysisSession.() -> R):
 internal fun KtSymbolWithMembers.declarations(): Sequence<KSDeclaration> {
     return analyze {
         this@declarations.let {
-            it.getDeclaredMemberScope().getAllSymbols() + it.getStaticMemberScope().getAllSymbols()
+            it.getDeclaredMemberScope().getAllSymbols() + it.getStaticDeclaredMemberScope().getAllSymbols()
         }.distinct().map { symbol ->
             when (symbol) {
                 is KtNamedClassOrObjectSymbol -> KSClassDeclarationImpl.getCached(symbol)

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DefaultFunctionProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DefaultFunctionProcessor.kt
@@ -19,6 +19,7 @@ package com.google.devtools.ksp.processor
 
 import com.google.devtools.ksp.getClassDeclarationByName
 import com.google.devtools.ksp.getDeclaredFunctions
+import com.google.devtools.ksp.getDeclaredProperties
 import com.google.devtools.ksp.isAbstract
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.symbol.KSAnnotated
@@ -100,6 +101,9 @@ class DefaultFunctionProcessor : AbstractTestProcessor() {
         result.add("${aProperty.simpleName.asString()}: ${aProperty.isAbstract()}")
         val D = resolver.getClassDeclarationByName("D")!!
         D.getAllProperties().forEach { result.add("${it.simpleName.asString()}: isMutable: ${it.isMutable}") }
+        resolver.getClassDeclarationByName("JavaDerived")!!.getDeclaredProperties().forEach {
+            result.add(it.toString())
+        }
         return emptyList()
     }
 

diff --git a/test-utils/testData/api/interfaceWithDefault.kt b/test-utils/testData/api/interfaceWithDefault.kt
@@ -76,3 +76,13 @@ class D {
 
     final int finalField;
 }
+
+// FILE: JavaBase.java
+
+class JavaBase {
+    static String staticField;
+}
+
+// FILE: JavaDerived.java
+class JavaDerived extends JavaBase {
+}