From 7fb408ecd7f4567675ad6e444061bb43b5fede5a Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 7 Aug 2020 16:19:40 +0300
Subject: [PATCH] FIR IDE: enable new project wizard to FIR IDE

---
 .../META-INF/extensions/ide-frontend-independent.xml        | 6 ++++++
 idea/resources/META-INF/extensions/ide.xml                  | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/idea/resources/META-INF/extensions/ide-frontend-independent.xml b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
index 4eda54a6cc7..078ee5e4f83 100644
--- a/idea/resources/META-INF/extensions/ide-frontend-independent.xml
+++ b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
@@ -20,5 +20,11 @@
                  defaultValue="false"
                  restartRequired="false"/>
 
+    <moduleBuilder builderClass="org.jetbrains.kotlin.tools.projectWizard.wizard.NewProjectWizardModuleBuilder"/>
+  </extensions>
+
+  <extensions defaultExtensionNs="org.jetbrains.kotlin">
+    <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator"/>
+    <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index f206df621f4..29bac656f0b 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -3,7 +3,6 @@
 
     <extensionPoints>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.updater" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.projectConfigurator" interface="org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.declarationAttributeAltererExtension"
                         interface="org.jetbrains.kotlin.extensions.DeclarationAttributeAltererExtension"
@@ -71,8 +70,6 @@
     </extensionPoints>
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
-        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator"/>
-        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator"/>
 
         <scriptDefinitionContributor
             id="ScriptTemplatesFromCompilerSettingsProvider"
@@ -133,7 +130,6 @@
 
         <fileEditorProvider implementation="org.jetbrains.kotlin.idea.scratch.ui.KtScratchFileEditorProvider"/>
 
-        <moduleBuilder builderClass="org.jetbrains.kotlin.tools.projectWizard.wizard.NewProjectWizardModuleBuilder"/>
         <jbProtocolCommand implementation="org.jetbrains.kotlin.tools.projectWizard.wizard.OpenNewProjectWizardProtocolCommand"/>
     </extensions>
 </idea-plugin>