From e31f286444a30c307efe49decfdae36e3b1dcd3c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 1 Mar 2018 13:27:53 +0100 Subject: [PATCH] Make NameResolver.getClassId extension instead of member To get rid of dependency of NameResolver on ClassId --- .../kotlin/incremental/ChangesCollector.kt | 1 + .../kotlin/incremental/IncrementalCacheCommon.kt | 1 + .../kotlin/incremental/IncrementalJsCache.kt | 1 + .../kotlin/incremental/JavaClassesTrackerImpl.kt | 1 + .../kotlin/incremental/ProtoCompareGenerated.kt | 1 + .../kotlin/checkers/LazyOperationsLog.kt | 1 + .../serialization/jvm/JvmNameResolverTest.kt | 1 + .../kotlin/load/kotlin/JvmNameResolver.kt | 16 +++++----------- .../kotlin/load/kotlin/ModuleMapping.kt | 1 + .../src/org/jetbrains/kotlin/name/ClassId.java | 7 ++++++- .../deserialization/NameResolver.java | 7 ++++++- .../deserialization/NameResolverImpl.kt | 12 ++++++++---- .../deserialization/NameResolverUtil.kt | 12 ++++++++++++ .../protobuf/GenerateProtoBufCompare.kt | 1 + .../builtIns/KotlinBuiltInDecompiler.kt | 1 + .../decompiler/classFile/KotlinClsStubBuilder.kt | 1 + .../common/AnnotationLoaderForStubBuilderImpl.kt | 5 +---- .../common/KotlinMetadataDecompiler.kt | 5 +---- .../common/KotlinMetadataStubBuilder.kt | 1 + .../stubBuilder/ClassClsStubBuilder.kt | 5 +---- .../stubBuilder/typeAliasClsStubBuilding.kt | 1 + .../kotlin/idea/vfilefinder/fileIndexes.kt | 1 + .../incremental/AbstractJsProtoComparisonTest.kt | 1 + 23 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt b/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt index 7e03d508cef..3718af00c40 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.protobuf.MessageLite import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.deserialization.NameResolver +import org.jetbrains.kotlin.serialization.deserialization.getClassId class ChangesCollector { private val removedMembers = hashMapOf>() diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt index d332d3c55db..a58a7d5566c 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.deserialization.TypeTable +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.supertypes import java.io.File diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt index e79d6c17bba..78ee822cb51 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol import java.io.DataInput diff --git a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt index eb82475fd0e..fdae69a423f 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.classId import org.jetbrains.kotlin.resolve.source.PsiSourceElement import org.jetbrains.kotlin.serialization.DescriptorSerializer import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.util.PerformanceCounter import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.sure diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt index 2101c8724f7..50be90140bc 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.metadata.js.JsProtoBuf import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.deserialization.NameResolver +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.utils.Interner import java.util.* diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt index 2d9213878f1..f18cfa05fa8 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.utils.Printer import java.lang.reflect.Constructor diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt index 62972b6b687..caf0b2e7d48 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import java.util.* diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt index ef53a9ddd6a..ed66ac07371 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt @@ -19,8 +19,6 @@ package org.jetbrains.kotlin.load.kotlin import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.* -import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.NameResolver import java.util.* @@ -85,15 +83,11 @@ class JvmNameResolver( override fun getName(index: Int) = Name.guessByFirstCharacter(getString(index)) - override fun getClassId(index: Int): ClassId { - val string = getString(index) - val lastSlash = string.lastIndexOf('/') - val packageName = - if (lastSlash < 0) FqName.ROOT - else FqName(string.substring(0, lastSlash).replace('/', '.')) - val className = FqName(string.substring(lastSlash + 1)) - return ClassId(packageName, className, index in localNameIndices) - } + override fun getQualifiedClassName(index: Int): String = + getString(index) + + override fun isLocalClassName(index: Int): Boolean = + index in localNameIndices companion object { val PREDEFINED_STRINGS = listOf( diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt index ba792811c83..fe7298ebd52 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl +import org.jetbrains.kotlin.serialization.deserialization.getClassId import java.io.ByteArrayInputStream import java.io.DataInputStream import java.io.IOException diff --git a/core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java b/core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java index 9bf3f1920c2..091d1a44500 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java @@ -100,9 +100,14 @@ public final class ClassId { */ @NotNull public static ClassId fromString(@NotNull String string) { + return fromString(string, false); + } + + @NotNull + public static ClassId fromString(@NotNull String string, boolean isLocal) { String packageName = StringsKt.substringBeforeLast(string, '/', "").replace('/', '.'); String className = StringsKt.substringAfterLast(string, '/', string); - return new ClassId(new FqName(packageName), new FqName(className), false); + return new ClassId(new FqName(packageName), new FqName(className), isLocal); } /** diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java index 3165c8f42b9..a0328c3489c 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java @@ -27,6 +27,11 @@ public interface NameResolver { @NotNull Name getName(int index); + /** + * @return the fully qualified name of some class in the format: `org/foo/bar/Test.Inner` + */ @NotNull - ClassId getClassId(int index); + String getQualifiedClassName(int index); + + boolean isLocalClassName(int index); } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt index 582f29e176b..f4b4be219f6 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName -import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import java.util.* @@ -32,11 +31,16 @@ class NameResolverImpl( override fun getName(index: Int) = Name.guessByFirstCharacter(strings.getString(index)) - override fun getClassId(index: Int): ClassId { - val (packageFqNameSegments, relativeClassNameSegments, isLocal) = traverseIds(index) - return ClassId(FqName.fromSegments(packageFqNameSegments), FqName.fromSegments(relativeClassNameSegments), isLocal) + override fun getQualifiedClassName(index: Int): String { + val (packageFqNameSegments, relativeClassNameSegments) = traverseIds(index) + val className = relativeClassNameSegments.joinToString(".") + return if (packageFqNameSegments.isEmpty()) className + else packageFqNameSegments.joinToString("/") + "/$className" } + override fun isLocalClassName(index: Int): Boolean = + traverseIds(index).third + fun getPackageFqName(index: Int): FqName { val packageNameSegments = traverseIds(index).first return FqName.fromSegments(packageNameSegments) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt new file mode 100644 index 00000000000..6369bab8fd8 --- /dev/null +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.serialization.deserialization + +import org.jetbrains.kotlin.name.ClassId + +fun NameResolver.getClassId(index: Int): ClassId { + return ClassId.fromString(getQualifiedClassName(index), isLocalClassName(index)) +} diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt index 43c39d3bd89..ed7b9536a8a 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt @@ -87,6 +87,7 @@ class GenerateProtoBufCompare { p.println("import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf") p.println("import org.jetbrains.kotlin.name.ClassId") p.println("import org.jetbrains.kotlin.serialization.deserialization.NameResolver") + p.println("import org.jetbrains.kotlin.serialization.deserialization.getClassId") p.println("import org.jetbrains.kotlin.utils.Interner") p.println("import java.util.*") p.println() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt index dc8c1354747..9109f3ae4e0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment +import org.jetbrains.kotlin.serialization.deserialization.getClassId import java.io.ByteArrayInputStream class KotlinBuiltInDecompiler : KotlinMetadataDecompiler( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt index 7eef563ec19..eeb47eefaba 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.deserialization.TypeTable +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.storage.LockBasedStorageManager diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt index ce38b8d40c9..39326031cb5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt @@ -21,10 +21,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.protobuf.MessageLite import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol -import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind -import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader -import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer +import org.jetbrains.kotlin.serialization.deserialization.* import org.jetbrains.kotlin.types.KotlinType class AnnotationLoaderForStubBuilderImpl( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt index 8fea70ab041..43b0ee1ac10 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt @@ -31,10 +31,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol -import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion -import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer -import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer -import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl +import org.jetbrains.kotlin.serialization.deserialization.* import org.jetbrains.kotlin.utils.addIfNotNull import java.io.IOException diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt index b933c57b84f..923532014e5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.deserialization.TypeTable +import org.jetbrains.kotlin.serialization.deserialization.getClassId open class KotlinMetadataStubBuilder( private val version: Int, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index 0d6b38c2c22..1248cb2efe0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -37,10 +37,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl import org.jetbrains.kotlin.serialization.Flags -import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer -import org.jetbrains.kotlin.serialization.deserialization.TypeTable -import org.jetbrains.kotlin.serialization.deserialization.supertypes +import org.jetbrains.kotlin.serialization.deserialization.* fun createClassStub( parent: StubElement, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt index 396bfa5898f..193ede2164c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeAliasStubImpl import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer +import org.jetbrains.kotlin.serialization.deserialization.getClassId fun createTypeAliasStub( parent: StubElement, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt index 16d26cdc52c..ff6d123a660 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.utils.JsMetadataVersion import java.io.ByteArrayInputStream import java.io.DataInput diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt index 6625df52eaa..7e84fe2dc2d 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl +import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol import org.junit.Assert