From 4d7af4beaefb4506943fe112eb1788c3711022d8 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sun, 26 Dec 2021 23:33:26 +0300 Subject: [PATCH] Analysis: fix imports and module names --- analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts | 2 +- .../analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt | 2 +- .../analysis/decompiler/stub/file/KotlinClsStubBuilder.kt | 1 - build.gradle.kts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts index 3a6fbddc951..a2370aefd62 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { api(project(":core:deserialization.common.jvm")) api(project(":core:deserialization")) implementation(project(":analysis:decompiled:decompiler-to-stubs")) - implementation(project(":core:deserialization.common.jvm.impl")) + implementation(project(":compiler:frontend.common.jvm")) implementation(project(":core:compiler.common.jvm")) api(intellijCore()) diff --git a/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt index bd7e0c3fa9f..2ec0ddb7731 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt @@ -11,7 +11,7 @@ import com.intellij.openapi.util.Key import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileWithId import com.intellij.reference.SoftReference -import org.jetbrains.kotlin.deserialization.common.jvm.impl.KotlinBinaryClassCache +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion diff --git a/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt index daa30109cf8..64ebe9f3059 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt @@ -14,7 +14,6 @@ import com.intellij.util.indexing.FileContent import org.jetbrains.kotlin.SpecialJvmAnnotations import org.jetbrains.kotlin.analysis.decompiler.stub.* import org.jetbrains.kotlin.descriptors.SourceElement -import org.jetbrains.kotlin.deserialization.common.jvm.impl.VirtualFileKotlinClass import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.* import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader diff --git a/build.gradle.kts b/build.gradle.kts index a071339fc3a..db224970c76 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -153,7 +153,7 @@ val commonCompilerModules = arrayOf( ":core:compiler.common", ":core:compiler.common.jvm", ":core:util.runtime", - ":core:deserialization.common.jvm.impl", + ":compiler:frontend.common.jvm", ":compiler:frontend.java", // TODO this is fe10 module but some utils used in fir ide now ":analysis:decompiled:decompiler-to-stubs", ":analysis:decompiled:decompiler-to-file-stubs",