From 2d0445ebaa1548ab41ba9ce92933c54c48c5b512 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <Vladimir.Dolzhenko@jetbrains.com>
Date: Wed, 20 May 2020 13:24:11 +0000
Subject: [PATCH] Add klib extension to ARCHIVE fileType

Fixed to #KT-38767
Relates to #KT-38571
---
 .../org/jetbrains/kotlin/idea/KLibFileType.kt | 15 ---------------
 .../kotlin/idea/core/KLibFileTypeFactory.kt   | 19 -------------------
 idea/resources/META-INF/plugin.xml            | 10 +---------
 idea/resources/META-INF/plugin.xml.201        | 10 +---------
 idea/resources/META-INF/plugin.xml.as40       | 10 +---------
 5 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 compiler/psi/src/org/jetbrains/kotlin/idea/KLibFileType.kt
 delete mode 100644 idea/idea-core/src/org/jetbrains/kotlin/idea/core/KLibFileTypeFactory.kt

diff --git a/compiler/psi/src/org/jetbrains/kotlin/idea/KLibFileType.kt b/compiler/psi/src/org/jetbrains/kotlin/idea/KLibFileType.kt
deleted file mode 100644
index d06257f666f..00000000000
--- a/compiler/psi/src/org/jetbrains/kotlin/idea/KLibFileType.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * 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.idea
-
-import com.intellij.ide.highlighter.ArchiveFileType
-
-object KLibFileType : ArchiveFileType() {
-
-    override fun getName(): String = "KLib"
-
-    override fun getDefaultExtension(): String = "klib"
-}
\ No newline at end of file
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KLibFileTypeFactory.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KLibFileTypeFactory.kt
deleted file mode 100644
index 9dbbb7d2302..00000000000
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KLibFileTypeFactory.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * 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.idea.core
-
-import com.intellij.ide.highlighter.ArchiveFileType
-import com.intellij.openapi.fileTypes.FileTypeConsumer
-import com.intellij.openapi.fileTypes.FileTypeFactory
-import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION
-
-// BUNCH: 193+
-// temporary enabled due to KT-38767
-class KLibFileTypeFactory : FileTypeFactory() {
-    override fun createFileTypes(consumer: FileTypeConsumer) {
-        consumer.consume(ArchiveFileType.INSTANCE, KLIB_FILE_EXTENSION)
-    }
-}
\ No newline at end of file
diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml
index b7af01af88c..e0b9060504b 100644
--- a/idea/resources/META-INF/plugin.xml
+++ b/idea/resources/META-INF/plugin.xml
@@ -126,15 +126,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
               fieldName="INSTANCE"
               language="kotlin"
               extensions="kt;kts"/>
-
-    <!-- temporary disabled due to KT-38767
-    <fileType name="KLib"
-              implementationClass="org.jetbrains.kotlin.idea.KLibFileType"
-              fieldName="INSTANCE"
-              extensions="klib"/>
-    -->
-    <fileTypeFactory implementation="org.jetbrains.kotlin.idea.core.KLibFileTypeFactory"/>
-
+    <fileType name="ARCHIVE" extensions="klib"/>
     <fileType name="KNM"
               implementationClass="org.jetbrains.kotlin.idea.klib.KlibMetaFileType"
               fieldName="INSTANCE"
diff --git a/idea/resources/META-INF/plugin.xml.201 b/idea/resources/META-INF/plugin.xml.201
index faa9b178d04..596c68d7077 100644
--- a/idea/resources/META-INF/plugin.xml.201
+++ b/idea/resources/META-INF/plugin.xml.201
@@ -126,15 +126,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
               fieldName="INSTANCE"
               language="kotlin"
               extensions="kt;kts"/>
-
-    <!-- temporary disabled due to KT-38767
-    <fileType name="KLib"
-              implementationClass="org.jetbrains.kotlin.idea.KLibFileType"
-              fieldName="INSTANCE"
-              extensions="klib"/>
-    -->
-    <fileTypeFactory implementation="org.jetbrains.kotlin.idea.core.KLibFileTypeFactory"/>
-
+    <fileType name="ARCHIVE" extensions="klib"/>
     <fileType name="KNM"
               implementationClass="org.jetbrains.kotlin.idea.klib.KlibMetaFileType"
               fieldName="INSTANCE"
diff --git a/idea/resources/META-INF/plugin.xml.as40 b/idea/resources/META-INF/plugin.xml.as40
index 8c18d03e974..e5bb7d31569 100644
--- a/idea/resources/META-INF/plugin.xml.as40
+++ b/idea/resources/META-INF/plugin.xml.as40
@@ -106,15 +106,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
               fieldName="INSTANCE"
               language="kotlin"
               extensions="kt;kts"/>
-
-    <!-- temporary disabled due to KT-38767
-    <fileType name="KLib"
-              implementationClass="org.jetbrains.kotlin.idea.KLibFileType"
-              fieldName="INSTANCE"
-              extensions="klib"/>
-    -->
-    <fileTypeFactory implementation="org.jetbrains.kotlin.idea.core.KLibFileTypeFactory"/>
-
+    <fileType name="ARCHIVE" extensions="klib"/>
     <fileType name="KNM"
               implementationClass="org.jetbrains.kotlin.idea.klib.KlibMetaFileType"
               fieldName="INSTANCE"