azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missed DOT_DEFAULT_EXTENSION

Browse Source 
#KTIJ-25470
This commit is contained in:
Vladimir Dolzhenko
2023-05-16 14:17:23 +02:00
committed by Space Team
parent f94c795b5b
commit 37c493f593
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/idea/KotlinFileType.java
+1
View File
@@ -24,6 +24,7 @@ import javax.swing.*;
public class KotlinFileType extends LanguageFileType { public class KotlinFileType extends LanguageFileType {
public static final String EXTENSION = "kt"; public static final String EXTENSION = "kt";
public static final String DOT_DEFAULT_EXTENSION = "." + EXTENSION;
public static final KotlinFileType INSTANCE = new KotlinFileType(); public static final KotlinFileType INSTANCE = new KotlinFileType();
private final NotNullLazyValue<Icon> myIcon = NotNullLazyValue.lazy(() -> KotlinIconProviderService.getInstance().getFileIcon()); private final NotNullLazyValue<Icon> myIcon = NotNullLazyValue.lazy(() -> KotlinIconProviderService.getInstance().getFileIcon());
core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
+2 -1
View File
@@ -30,6 +30,7 @@ object BuiltInSerializerProtocol : SerializerExtensionProtocol(
BuiltInsProtoBuf.typeParameterAnnotation BuiltInsProtoBuf.typeParameterAnnotation
) { ) {
const val BUILTINS_FILE_EXTENSION = "kotlin_builtins" const val BUILTINS_FILE_EXTENSION = "kotlin_builtins"
const val DOT_DEFAULT_EXTENSION = ".$BUILTINS_FILE_EXTENSION"
fun getBuiltInsFilePath(fqName: FqName): String = fun getBuiltInsFilePath(fqName: FqName): String =
fqName.asString().replace('.', '/') + "/" + getBuiltInsFileName( fqName.asString().replace('.', '/') + "/" + getBuiltInsFileName(
@@ -37,7 +38,7 @@ object BuiltInSerializerProtocol : SerializerExtensionProtocol(
) )
fun getBuiltInsFileName(fqName: FqName): String = fun getBuiltInsFileName(fqName: FqName): String =
shortName(fqName) + "." + BUILTINS_FILE_EXTENSION shortName(fqName) + DOT_DEFAULT_EXTENSION
private fun shortName(fqName: FqName): String = private fun shortName(fqName: FqName): String =
if (fqName.isRoot) "default-package" else fqName.shortName().asString() if (fqName.isRoot) "default-package" else fqName.shortName().asString()