From 37c493f593f735fa7dc70c619efe45fb5076c011 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Tue, 16 May 2023 14:17:23 +0200 Subject: [PATCH] Add missed DOT_DEFAULT_EXTENSION #KTIJ-25470 --- compiler/psi/src/org/jetbrains/kotlin/idea/KotlinFileType.java | 1 + .../deserialization/builtins/BuiltInSerializerProtocol.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/idea/KotlinFileType.java b/compiler/psi/src/org/jetbrains/kotlin/idea/KotlinFileType.java index fc37b52b585..831772e8201 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/idea/KotlinFileType.java +++ b/compiler/psi/src/org/jetbrains/kotlin/idea/KotlinFileType.java @@ -24,6 +24,7 @@ import javax.swing.*; public class KotlinFileType extends LanguageFileType { public static final String EXTENSION = "kt"; + public static final String DOT_DEFAULT_EXTENSION = "." + EXTENSION; public static final KotlinFileType INSTANCE = new KotlinFileType(); private final NotNullLazyValue myIcon = NotNullLazyValue.lazy(() -> KotlinIconProviderService.getInstance().getFileIcon()); diff --git a/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt index 9b4f5326070..504456431af 100644 --- a/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt +++ b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt @@ -30,6 +30,7 @@ object BuiltInSerializerProtocol : SerializerExtensionProtocol( BuiltInsProtoBuf.typeParameterAnnotation ) { const val BUILTINS_FILE_EXTENSION = "kotlin_builtins" + const val DOT_DEFAULT_EXTENSION = ".$BUILTINS_FILE_EXTENSION" fun getBuiltInsFilePath(fqName: FqName): String = fqName.asString().replace('.', '/') + "/" + getBuiltInsFileName( @@ -37,7 +38,7 @@ object BuiltInSerializerProtocol : SerializerExtensionProtocol( ) fun getBuiltInsFileName(fqName: FqName): String = - shortName(fqName) + "." + BUILTINS_FILE_EXTENSION + shortName(fqName) + DOT_DEFAULT_EXTENSION private fun shortName(fqName: FqName): String = if (fqName.isRoot) "default-package" else fqName.shortName().asString()