From 417554dca06474373df19fff329b253995451de8 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Tue, 3 Mar 2020 18:54:45 +0300
Subject: [PATCH] Move .klib files from KotlinNativeFileTypeFactory to
 Kotlin-wide one

---
 .../org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java | 4 ++++
 .../ide/konan/decompiler/KotlinNativeMetaFileTypeFactory.kt   | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java
index a61eda3e04f..09253152424 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinFileTypeFactory.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.idea.core;
 
+import com.intellij.ide.highlighter.ArchiveFileType;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
@@ -26,6 +27,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import static org.jetbrains.kotlin.library.KotlinLibraryUtilsKt.KLIB_FILE_EXTENSION;
+
 
 public class KotlinFileTypeFactory extends FileTypeFactory {
     public final static String[] KOTLIN_EXTENSIONS = new String[] { "kt", "kts" };
@@ -35,5 +38,6 @@ public class KotlinFileTypeFactory extends FileTypeFactory {
     @Override
     public void createFileTypes(@NotNull FileTypeConsumer consumer) {
         consumer.consume(KotlinFileType.INSTANCE, "kt;kts");
+        consumer.consume(ArchiveFileType.INSTANCE, KLIB_FILE_EXTENSION);
     }
 }
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetaFileTypeFactory.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetaFileTypeFactory.kt
index 253a669bbd7..bc34e744c2f 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetaFileTypeFactory.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/decompiler/KotlinNativeMetaFileTypeFactory.kt
@@ -9,6 +9,5 @@ import com.intellij.openapi.fileTypes.FileTypeConsumer
 import com.intellij.openapi.fileTypes.FileTypeFactory
 
 class KotlinNativeMetaFileTypeFactory : FileTypeFactory() {
-
-    override fun createFileTypes(consumer: FileTypeConsumer) = consumer.consume(KotlinNativeMetaFileType, KotlinNativeMetaFileType.defaultExtension)
+    override fun createFileTypes(consumer: FileTypeConsumer) = consumer.consume(KlibMetaFileType, KlibMetaFileType.defaultExtension)
 }