K2 UAST: lookup properties in the containing class, not companion object

...because properties in the companion object are materialized in the containing class. ^KTIJ-27684 fixed
2023-11-19 00:28:05 -08:00
parent 10c9b81c79
commit e5095a60ba
17 changed files with 319 additions and 10 deletions
@@ -51,4 +51,46 @@ public class FirStandaloneNormalAnalysisLibraryBinaryModulePsiDeclarationProvide
    public void testMultifileFacade() throws Exception {
        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/multifileFacade.kt");
    }
+
+    @Test
+    @TestMetadata("propertiesInCompanionObject.kt")
+    public void testPropertiesInCompanionObject() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject.kt");
+    }
+
+    @Test
+    @TestMetadata("propertiesInCompanionObject_JvmField.kt")
+    public void testPropertiesInCompanionObject_JvmField() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmField.kt");
+    }
+
+    @Test
+    @TestMetadata("propertiesInCompanionObject_JvmStatic.kt")
+    public void testPropertiesInCompanionObject_JvmStatic() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt");
+    }
+
+    @Test
+    @TestMetadata("propertiesInNamedCompanionObject.kt")
+    public void testPropertiesInNamedCompanionObject() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject.kt");
+    }
+
+    @Test
+    @TestMetadata("propertiesInNamedCompanionObject_JvmField.kt")
+    public void testPropertiesInNamedCompanionObject_JvmField() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmField.kt");
+    }
+
+    @Test
+    @TestMetadata("propertiesInNamedCompanionObject_JvmStatic.kt")
+    public void testPropertiesInNamedCompanionObject_JvmStatic() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInNamedCompanionObject_JvmStatic.kt");
+    }
+
+    @Test
+    @TestMetadata("propertiesInObject.kt")
+    public void testPropertiesInObject() throws Exception {
+        runTest("analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInObject.kt");
+    }
 }
@@ -0,0 +1,35 @@
+// MODULE: lib
+
+// FILE: some/Dependency.kt
+package some
+
+interface Flag<T>
+
+class Dependency {
+    companion object {
+        @JvmField val JVM_FIELD_FLAG: Flag<*> = TODO()
+        @JvmStatic val JVM_STATIC_FLAG: Flag<*> = TODO()
+        val VAL_FLAG: Flag<*> = TODO()
+        var varFlag: Flag<*> = TODO()
+    }
+}
+
+val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(Dependency.JVM_FIELD_FLAG)
+    consumeFlag(Dependency.JVM_STATIC_FLAG)
+    consumeFlag(Dependency.VAL_<caret>FLAG)
+    consumeFlag(Dependency.varFlag)
+    consumeFlag(DEPENDENCY_TOP_LEVEL_VAL_FLAG)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:VAL_FLAG
@@ -0,0 +1,35 @@
+// MODULE: lib
+
+// FILE: some/Dependency.kt
+package some
+
+interface Flag<T>
+
+class Dependency {
+    companion object {
+        @JvmField val JVM_FIELD_FLAG: Flag<*> = TODO()
+        @JvmStatic val JVM_STATIC_FLAG: Flag<*> = TODO()
+        val VAL_FLAG: Flag<*> = TODO()
+        var varFlag: Flag<*> = TODO()
+    }
+}
+
+val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(Dependency.JVM_<caret>FIELD_FLAG)
+    consumeFlag(Dependency.JVM_STATIC_FLAG)
+    consumeFlag(Dependency.VAL_FLAG)
+    consumeFlag(Dependency.varFlag)
+    consumeFlag(DEPENDENCY_TOP_LEVEL_VAL_FLAG)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:JVM_FIELD_FLAG
@@ -0,0 +1,35 @@
+// MODULE: lib
+
+// FILE: some/Dependency.kt
+package some
+
+interface Flag<T>
+
+class Dependency {
+    companion object {
+        @JvmField val JVM_FIELD_FLAG: Flag<*> = TODO()
+        @JvmStatic val JVM_STATIC_FLAG: Flag<*> = TODO()
+        val VAL_FLAG: Flag<*> = TODO()
+        var varFlag: Flag<*> = TODO()
+    }
+}
+
+val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(Dependency.JVM_FIELD_FLAG)
+    consumeFlag(Dependency.JVM_<caret>STATIC_FLAG)
+    consumeFlag(Dependency.VAL_FLAG)
+    consumeFlag(Dependency.varFlag)
+    consumeFlag(DEPENDENCY_TOP_LEVEL_VAL_FLAG)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:JVM_STATIC_FLAG
@@ -0,0 +1,35 @@
+// MODULE: lib
+
+// FILE: some/Dependency.kt
+package some
+
+interface Flag<T>
+
+class Dependency {
+    companion object Named {
+        @JvmField val JVM_FIELD_FLAG: Flag<*> = TODO()
+        @JvmStatic val JVM_STATIC_FLAG: Flag<*> = TODO()
+        val VAL_FLAG: Flag<*> = TODO()
+        var varFlag: Flag<*> = TODO()
+    }
+}
+
+val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(Dependency.JVM_FIELD_FLAG)
+    consumeFlag(Dependency.JVM_STATIC_FLAG)
+    consumeFlag(Dependency.VAL_<caret>FLAG)
+    consumeFlag(Dependency.varFlag)
+    consumeFlag(DEPENDENCY_TOP_LEVEL_VAL_FLAG)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:VAL_FLAG
@@ -0,0 +1,35 @@
+// MODULE: lib
+
+// FILE: some/Dependency.kt
+package some
+
+interface Flag<T>
+
+class Dependency {
+    companion object Named {
+        @JvmField val JVM_FIELD_FLAG: Flag<*> = TODO()
+        @JvmStatic val JVM_STATIC_FLAG: Flag<*> = TODO()
+        val VAL_FLAG: Flag<*> = TODO()
+        var varFlag: Flag<*> = TODO()
+    }
+}
+
+val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(Dependency.JVM_<caret>FIELD_FLAG)
+    consumeFlag(Dependency.JVM_STATIC_FLAG)
+    consumeFlag(Dependency.VAL_FLAG)
+    consumeFlag(Dependency.varFlag)
+    consumeFlag(DEPENDENCY_TOP_LEVEL_VAL_FLAG)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:JVM_FIELD_FLAG
@@ -0,0 +1,35 @@
+// MODULE: lib
+
+// FILE: some/Dependency.kt
+package some
+
+interface Flag<T>
+
+class Dependency {
+    companion object Named {
+        @JvmField val JVM_FIELD_FLAG: Flag<*> = TODO()
+        @JvmStatic val JVM_STATIC_FLAG: Flag<*> = TODO()
+        val VAL_FLAG: Flag<*> = TODO()
+        var varFlag: Flag<*> = TODO()
+    }
+}
+
+val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(Dependency.JVM_FIELD_FLAG)
+    consumeFlag(Dependency.JVM_<caret>STATIC_FLAG)
+    consumeFlag(Dependency.VAL_FLAG)
+    consumeFlag(Dependency.varFlag)
+    consumeFlag(DEPENDENCY_TOP_LEVEL_VAL_FLAG)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:JVM_STATIC_FLAG
@@ -0,0 +1,26 @@
+// MODULE: lib
+
+// FILE: some/DependencyObject.kt
+package some
+
+interface Flag<T>
+
+object DependencyObject {
+    val VAL_FLAG: Flag<*> = TODO()
+    var varFlag: Flag<*> = TODO()
+}
+
+// MODULE: app
+// DEPENDENCY: lib Binary
+// FILE: main.kt
+
+package some
+
+private fun consumeFlag(p: Flag<*>) {
+    println(p)
+}
+
+fun test() {
+    consumeFlag(DependencyObject.VAL_FLAG)
+    consumeFlag(DependencyObject.var<caret>Flag)
+}
@@ -0,0 +1,2 @@
+Resolved to:
+PsiField:varFlag
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.providers

 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiField
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.symbols.*
@@ -58,10 +59,15 @@ object DecompiledPsiDeclarationProvider {
        project: Project
    ): PsiElement? {
        return variableLikeSymbol.callableIdIfNonLocal?.let {
-            project.createPsiDeclarationProvider(variableLikeSymbol.scope(project))
+            val candidates = project.createPsiDeclarationProvider(variableLikeSymbol.scope(project))
                ?.getProperties(it)
-                // TODO: needs to pick field/getter/setter accordingly?
-                ?.firstOrNull()
+            if (candidates?.size == 1)
+                candidates.single()
+            else {
+                // Weigh [PsiField]
+                candidates?.firstOrNull { psiMember -> psiMember is PsiField }
+                    ?: candidates?.firstOrNull()
+            }
        }
    }

@@ -91,10 +91,12 @@ private class KotlinStaticPsiDeclarationFromBinaryModuleProvider(
        return listOfNotNull(javaFileManager.findClass(classId.asFqNameString(), scope))
    }

-    // TODO(dimonchik0036): support 'is' accessor
    override fun getProperties(callableId: CallableId): Collection<PsiMember> {
        val classes = callableId.classId?.let { classId ->
-            getClassesByClassId(classId)
+            val classFromCurrentClassId = getClassesByClassId(classId)
+            // property in companion object is actually materialized at the containing class.
+            val classFromOuterClassID = classId.outerClassId?.let { getClassesByClassId(it) } ?: emptyList()
+            classFromCurrentClassId + classFromOuterClassID
        } ?: clsClassImplsInPackage(callableId.packageName)
        return classes.flatMap { psiClass ->
            psiClass.children
@@ -102,17 +104,26 @@ private class KotlinStaticPsiDeclarationFromBinaryModuleProvider(
                .filter { psiMember ->
                    if (psiMember !is PsiMethod && psiMember !is PsiField) return@filter false
                    val name = psiMember.name ?: return@filter false
+                    val id = callableId.callableName.identifier
                    // PsiField a.k.a. backing field
-                    name == callableId.callableName.identifier ||
-                            // PsiMethod, i.e., accessors
-                            (name.startsWith("get") || name.startsWith("set")) &&
+                    if (name == id) return@filter true
+                    // PsiMethod, i.e., accessors
+                    val nameWithoutPrefix = name.nameWithoutAccessorPrefix ?: return@filter false
+                    // E.g., getJVM_FIELD -> JVM_FIELD
+                    nameWithoutPrefix == id ||
                            // E.g., getFooBar -> FooBar -> fooBar
-                            (name.substring(3).decapitalizeSmart().endsWith(callableId.callableName.identifier))
-
+                            nameWithoutPrefix.decapitalizeSmart().endsWith(id)
                }
        }.toList()
    }

+    private val String.nameWithoutAccessorPrefix: String?
+        get() = when {
+            this.startsWith("get") || this.startsWith("set") -> substring(3)
+            this.startsWith("is") -> substring(2)
+            else -> null
+        }
+
    override fun getFunctions(callableId: CallableId): Collection<PsiMethod> {
        val classes = callableId.classId?.let { classId ->
            getClassesByClassId(classId)