diff options
Diffstat (limited to 'plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt')
| -rw-r--r-- | plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt index ff08396c812e..091cc8052d7c 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt @@ -8,11 +8,11 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.ThrowableRunnable import com.intellij.util.indexing.FileContentImpl -import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache -import org.jetbrains.kotlin.idea.decompiler.builtIns.BuiltInDefinitionFile -import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler -import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClassFileDecompiler -import org.jetbrains.kotlin.idea.decompiler.common.FileWithMetadata +import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltInDefinitionFile +import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler +import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache +import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinMetadataStubBuilder import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor @@ -63,7 +63,7 @@ class BuiltInDecompilerConsistencyTest : KotlinLightCodeInsightFixtureTestCase() // do not compare commonized classes // proper fix is to get `expect` modifier from stub rather from bytecode metadata: https://youtrack.jetbrains.com/issue/KT-45534 val expectClassNames = builtInsDecompiler.readFile(builtInsFile)?.let { metadata -> - return@let if (metadata is FileWithMetadata.Compatible) { + return@let if (metadata is KotlinMetadataStubBuilder.FileWithMetadata.Compatible) { metadata.proto.class_List.filter { Flags.IS_EXPECT_CLASS.get(it.flags) } .map { metadata.nameResolver.getClassId(it.fqName).shortClassName.asString() }.toSet() } else null @@ -80,7 +80,7 @@ class BuiltInDecompilerConsistencyTest : KotlinLightCodeInsightFixtureTestCase() val classFile = dir.findChild(className + "." + JavaClassFileType.INSTANCE.defaultExtension)!! val fileContent = FileContentImpl.createByFile(classFile) val file = fileContent.file - if (IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(file) == null) continue + if (ClsKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(file) == null) continue val fileStub = classFileDecompiler.stubBuilder.buildFileStub(fileContent) ?: continue val classStub = fileStub.findChildStubByType(KtClassElementType.getStubType(false)) ?: continue val classFqName = classStub.getFqName()!! |