From a6e1826bbce05534bfb44b8bf2289104ad7b4864 Mon Sep 17 00:00:00 2001 From: Pavel Mikhailovskii Date: Fri, 3 Mar 2023 15:38:12 +0000 Subject: [PATCH] Reimplement the fix for KtSuperTypeList.findEntry --- .../classes/KotlinSuperTypeListBuilder.kt | 8 ++++++- .../kotlin/asJava/classes/implUtils.kt | 21 ++++--------------- ...htClassesByPsiForLibraryTestGenerated.java | 6 ++++++ ...ghtClassesByPsiForSourceTestGenerated.java | 6 ++++++ .../unresolvedGenericSupertypes.fir.java | 7 +++++++ .../unresolvedGenericSupertypes.java | 7 +++++++ .../unresolvedGenericSupertypes.kt | 9 ++++++++ 7 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.fir.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt index ea01c042fbd..09ef931bf99 100644 --- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt +++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt @@ -32,7 +32,7 @@ class KotlinSuperTypeListBuilder( override fun getParent() = this@KotlinSuperTypeListBuilder val kotlinOrigin by lazyPub { - element.qualifiedName?.let { this@KotlinSuperTypeListBuilder.myKotlinOrigin?.findEntry(it) } + element.nameFromSource?.let { this@KotlinSuperTypeListBuilder.myKotlinOrigin?.findEntry(it) } } override fun delete() { @@ -81,3 +81,9 @@ class KotlinSuperTypeListBuilder( return null } } + +private val PsiQualifiedReference.nameFromSource: String? + get() { + val name = referenceName ?: return null + return (qualifier as? PsiQualifiedReference)?.let { "${it.nameFromSource}.$name" } ?: name + } diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt index 8e3f13ccc5e..fccde4744a3 100644 --- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt +++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt @@ -13,24 +13,11 @@ import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService import org.jetbrains.kotlin.psi.* -fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? { - val name = fqNameToFind.substringAfterLast(delimiter = '.', missingDelimiterValue = "") - if (name.isEmpty()) { - return entries.find { it.typeAsUserType?.textMatches(fqNameToFind) == true } - } +fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? = + entries.find { it.typeAsUserType?.fqName == fqNameToFind } - val qualifier = fqNameToFind.substringBeforeLast('.') - val entries = entries.mapNotNull { entry -> entry.typeAsUserType?.let { entry to it } } - .filter { (_, type) -> type.referencedName == name && (type.qualifier?.textMatches(qualifier) != false) } - .ifEmpty { return null } - - return if (entries.size == 1) { - entries.first().first - } else { - val entry = entries.firstOrNull { it.second.qualifier != null } ?: entries.firstOrNull() - entry?.first - } -} +private val KtUserType.fqName: String? + get() = qualifier?.let { "${it.fqName}.$referencedName" } ?: referencedName // NOTE: avoid using blocking lazy in light classes, it leads to deadlocks fun lazyPub(initializer: () -> T) = lazy(LazyThreadSafetyMode.PUBLICATION, initializer) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java index 5ac6367b818..7faf340a22c 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java @@ -306,6 +306,12 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/typealiasInTypeArguments.kt"); } + @Test + @TestMetadata("unresolvedGenericSupertypes.kt") + public void testUnresolvedGenericSupertypes() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt"); + } + @Test @TestMetadata("unresolvedWithAliasedImport.kt") public void testUnresolvedWithAliasedImport() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java index 84bb20e214b..b44d1825fc1 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java @@ -306,6 +306,12 @@ public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbo runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/typealiasInTypeArguments.kt"); } + @Test + @TestMetadata("unresolvedGenericSupertypes.kt") + public void testUnresolvedGenericSupertypes() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt"); + } + @Test @TestMetadata("unresolvedWithAliasedImport.kt") public void testUnresolvedWithAliasedImport() throws Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.fir.java new file mode 100644 index 00000000000..61c11087e0a --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.fir.java @@ -0,0 +1,7 @@ +public final class C1 /* C1*/ extends Super implements Intf1, Intf2> { + public C1();// .ctor() +} + +public final class C2 /* C2*/ extends com.example.Super implements com.example.Intf1, com.example.Intf2> { + public C2();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java new file mode 100644 index 00000000000..7e0a3a4e712 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java @@ -0,0 +1,7 @@ +public final class C1 /* C1*/ { + public C1();// .ctor() +} + +public final class C2 /* C2*/ { + public C2();// .ctor() +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt new file mode 100644 index 00000000000..4de903fcb93 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt @@ -0,0 +1,9 @@ +public class C1: Intf1 < A , B >, Super < T , U >(42), + Intf2 < X , + Y < Z >> + +public class C2: com . example . Intf1 < A , B >, com . example . Super < T , U >(42), + com . example . Intf2 < X , + Y < Z >> + +// COMPILATION_ERRORS \ No newline at end of file