From d7f88ecb373d5263722eb225ff128f76269e1eb6 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 1 Sep 2020 17:59:45 +0300 Subject: [PATCH] Move common jvm classes from :core:descriptors.jvm to :core:compiler.common.jvm Original commit: 6906e0d82d27127b27a01b9508588cb068e8e572 GitOrigin-RevId: 206e669e9d14bd3451e44eda7d1d2ea2f6840eb6 --- .../idea/decompiler/navigation/findDecompiledDeclaration.kt | 4 ++-- .../idea/debugger/test/AbstractPositionManagerTest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt index 5c60cd48d213..cea25fdd958b 100644 --- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt +++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt @@ -11,7 +11,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.builtins.DefaultBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsSettings +import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsSignatures import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor import org.jetbrains.kotlin.idea.caches.project.BinaryModuleInfo @@ -178,7 +178,7 @@ object ByDescriptorIndexer : DecompiledTextIndexer { if (descriptor !is ClassDescriptor) return null val classFqName = descriptor.fqNameUnsafe - if (!JvmBuiltInsSettings.isSerializableInJava(classFqName)) return null + if (!JvmBuiltInsSignatures.isSerializableInJava(classFqName)) return null val builtInDescriptor = DefaultBuiltIns.Instance.builtInsModule.resolveTopLevelClass(classFqName.toSafe(), NoLookupLocation.FROM_IDE) diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractPositionManagerTest.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractPositionManagerTest.java index a79337b4ea0e..dd09e4cae188 100644 --- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractPositionManagerTest.java +++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractPositionManagerTest.java @@ -41,7 +41,6 @@ import org.jetbrains.kotlin.idea.debugger.test.mock.SmartMockReferenceTypeContex import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseKt; import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.load.kotlin.PackagePartProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind;