From db7119f04d56214223dc3ae168a0bc0f58c1cf3b Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 7 Aug 2020 16:17:54 +0300
Subject: [PATCH] FIR IDE: fix ability to create new Kotlin files

---
 idea/resources-fir/META-INF/plugin.xml                    | 8 +++++++-
 .../META-INF/extensions/ide-frontend-independent.xml      | 3 +++
 idea/resources/META-INF/extensions/ide.xml                | 3 +--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/idea/resources-fir/META-INF/plugin.xml b/idea/resources-fir/META-INF/plugin.xml
index 99520961f27..a9d9fb852ed 100644
--- a/idea/resources-fir/META-INF/plugin.xml
+++ b/idea/resources-fir/META-INF/plugin.xml
@@ -71,8 +71,14 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
     <beforeResolveHighlightingVisitor implementation="org.jetbrains.kotlin.idea.fir.highlighter.visitors.DeclarationHighlightingExtension"/>
   </extensions>
 
+  <actions>
+    <action id="Kotlin.NewFile" class="org.jetbrains.kotlin.idea.actions.NewKotlinFileAction">
+      <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewGroup1"/>
+    </action>
+  </actions>
 
-<!--decompiler-->
+
+  <!--decompiler-->
   <extensions defaultExtensionNs="com.intellij">
     <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClassFileDecompiler"/>
     <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler"/>
diff --git a/idea/resources/META-INF/extensions/ide-frontend-independent.xml b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
index c22b31b5eb0..4eda54a6cc7 100644
--- a/idea/resources/META-INF/extensions/ide-frontend-independent.xml
+++ b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
@@ -5,6 +5,9 @@
     <extensionPoint qualifiedName="org.jetbrains.kotlin.binaryExtension" interface="org.jetbrains.kotlin.idea.util.KotlinBinaryExtension"/>
     <extensionPoint qualifiedName="org.jetbrains.kotlin.buildSystemTypeDetector"
                     interface="org.jetbrains.kotlin.idea.configuration.BuildSystemTypeDetector"/>
+    <extensionPoint qualifiedName="org.jetbrains.kotlin.projectConfigurator" interface="org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator"/>
+    <extensionPoint qualifiedName="org.jetbrains.kotlin.newFileHook"
+                    interface="org.jetbrains.kotlin.idea.actions.NewKotlinFileHook"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index a1ab97d1965..f206df621f4 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -25,8 +25,7 @@
                         interface="org.jetbrains.kotlin.idea.facet.KotlinFacetValidatorCreator"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.clearBuildState"
                         interface="org.jetbrains.kotlin.idea.compiler.configuration.ClearBuildStateExtension"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.newFileHook"
-                        interface="org.jetbrains.kotlin.idea.actions.NewKotlinFileHook"/>
+
         <extensionPoint qualifiedName="org.jetbrains.kotlin.completionExtension"
                         interface="org.jetbrains.kotlin.idea.completion.KotlinCompletionExtension"/>