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

Move .klib files from KotlinNativeFileTypeFactory to Kotlin-wide one

Browse Source
This commit is contained in:
Dmitry Savvinov
2020-03-03 18:54:45 +03:00
committed by Dmitriy Dolovov
parent 987e1019a8
commit 417554dca0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java
+4
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.core; package org.jetbrains.kotlin.idea.core;
import com.intellij.ide.highlighter.ArchiveFileType;
import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeConsumer; import com.intellij.openapi.fileTypes.FileTypeConsumer;
import com.intellij.openapi.fileTypes.FileTypeFactory; import com.intellij.openapi.fileTypes.FileTypeFactory;
@@ -26,6 +27,8 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static org.jetbrains.kotlin.library.KotlinLibraryUtilsKt.KLIB_FILE_EXTENSION;
public class KotlinFileTypeFactory extends FileTypeFactory { public class KotlinFileTypeFactory extends FileTypeFactory {
public final static String[] KOTLIN_EXTENSIONS = new String[] { "kt", "kts" }; public final static String[] KOTLIN_EXTENSIONS = new String[] { "kt", "kts" };
@@ -35,5 +38,6 @@ public class KotlinFileTypeFactory extends FileTypeFactory {
@Override @Override
public void createFileTypes(@NotNull FileTypeConsumer consumer) { public void createFileTypes(@NotNull FileTypeConsumer consumer) {
consumer.consume(KotlinFileType.INSTANCE, "kt;kts"); consumer.consume(KotlinFileType.INSTANCE, "kt;kts");
consumer.consume(ArchiveFileType.INSTANCE, KLIB_FILE_EXTENSION);
} }
} }
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetaFileTypeFactory.kt
+1 -2
View File
@@ -9,6 +9,5 @@ import com.intellij.openapi.fileTypes.FileTypeConsumer
import com.intellij.openapi.fileTypes.FileTypeFactory import com.intellij.openapi.fileTypes.FileTypeFactory
class KotlinNativeMetaFileTypeFactory : FileTypeFactory() { class KotlinNativeMetaFileTypeFactory : FileTypeFactory() {
override fun createFileTypes(consumer: FileTypeConsumer) = consumer.consume(KlibMetaFileType, KlibMetaFileType.defaultExtension)
override fun createFileTypes(consumer: FileTypeConsumer) = consumer.consume(KotlinNativeMetaFileType, KotlinNativeMetaFileType.defaultExtension)
} }