From 321272abed8a1ea7fe5692abc6a7f89023c0de37 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 15 May 2020 11:03:59 +0300
Subject: [PATCH] Wizard: make new wizard non-experimental

relates to #KT-38952
---
 .../KotlinNewProjectWizardUIBundle.properties        |  2 +-
 .../wizard/NewProjectWizardModuleBuilder.kt          |  3 +--
 idea/resources/META-INF/extensions/ide.xml           |  4 ----
 .../idea/configuration/ExperimentalFeatures.kt       | 12 ------------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardUIBundle.properties b/idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardUIBundle.properties
index bb0422a459b..95f49900b07 100644
--- a/idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardUIBundle.properties
+++ b/idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardUIBundle.properties
@@ -1,4 +1,4 @@
-generator.title=Kotlin (Experimental Wizard)
+generator.title=Kotlin
 
 error.nothing.selected=Select a module to configure
 error.generation=Project generation error 
diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt
index 17e26b5a0ef..54db30a6b6c 100644
--- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt
+++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt
@@ -68,8 +68,7 @@ class NewProjectWizardModuleBuilder : EmptyModuleBuilder() {
         private const val INVALID_PROJECT_NAME_MESSAGE = "Invalid project name"
     }
 
-    override fun isAvailable(): Boolean =
-        ExperimentalFeatures.NewWizard.isEnabled && isCreatingNewProject()
+    override fun isAvailable(): Boolean = isCreatingNewProject()
 
     private var wizardContext: WizardContext? = null
     private var finishButtonClicked: Boolean = false
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index 0a023d83e2e..635107e2f46 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -142,10 +142,6 @@
                      description="Enable new Java to Kotlin converter"
                      defaultValue="true"
                      restartRequired="false"/>
-        <registryKey key="kotlin.experimental.project.wizard"
-                     description="Enable new Kotlin project wizard"
-                     defaultValue="true"
-                     restartRequired="false"/>
 
         <fileEditorProvider implementation="org.jetbrains.kotlin.idea.scratch.ui.KtScratchFileEditorProvider"/>
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
index fd0c962d06a..a92a5d0bfc3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
@@ -26,20 +26,8 @@ object ExperimentalFeatures {
         enabledByDefault = true
     )
 
-    val NewWizard = object : RegistryExperimentalFeature(
-        title = KotlinBundle.message("configuration.feature.text.new.experimental.project.wizard"),
-        registryKey = "kotlin.experimental.project.wizard",
-        enabledByDefault = true
-    ) {
-        override fun shouldBeShown(): Boolean {
-            val platformVersion = PlatformVersion.getCurrent() ?: return true
-            return platformVersion.platform != PlatformVersion.Platform.ANDROID_STUDIO
-        }
-    }
-
     val allFeatures: List<ExperimentalFeature> = listOf(
         NewJ2k,
-        NewWizard
     ) + ExperimentalFeature.EP_NAME.extensionList
 }