From 607b8f6b6151431a13baff6758d9f7001de67417 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 13 Feb 2023 17:28:35 +0100 Subject: [PATCH] Revert "[SLC] Support generics and ignore whitespace in KtSuperTypeList.findEntry" This reverts commit e77f5c7764ce3573b739e6b0aeec49be25512b99. --- .../kotlin/asJava/classes/implUtils.kt | 21 +++++++++++++++---- ...htClassesByPsiForLibraryTestGenerated.java | 6 ------ ...ghtClassesByPsiForSourceTestGenerated.java | 6 ------ .../unresolvedGenericSupertypes.java | 7 ------- .../unresolvedGenericSupertypes.kt | 9 -------- 5 files changed, 17 insertions(+), 32 deletions(-) delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt 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 4e523fd499b..8e3f13ccc5e 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,11 +13,24 @@ import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService import org.jetbrains.kotlin.psi.* -fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? = - entries.find { it.typeAsUserType?.simpleName == fqNameToFind } +fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? { + val name = fqNameToFind.substringAfterLast(delimiter = '.', missingDelimiterValue = "") + if (name.isEmpty()) { + return entries.find { it.typeAsUserType?.textMatches(fqNameToFind) == true } + } -private val KtUserType.simpleName: String? - get() = qualifier?.let { "${it.simpleName}.$referencedName" } ?: referencedName + 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 + } +} // 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 b45f1877ced..16cea2b574f 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 @@ -300,12 +300,6 @@ 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 235803ff675..3ad46bfb136 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 @@ -300,12 +300,6 @@ 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.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java deleted file mode 100644 index 61c11087e0a..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.java +++ /dev/null @@ -1,7 +0,0 @@ -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.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt deleted file mode 100644 index 4de903fcb93..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedGenericSupertypes.kt +++ /dev/null @@ -1,9 +0,0 @@ -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