Merge pull request #3791 from soomtong/project-icon

Rename NewProjectWizard to use language generator

Author: joshuataylor

resources/META-INF/rich-platform-plugin.xml

@@ -5,7 +5,7 @@
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
         <moduleType id="ELIXIR_MODULE" implementationClass="org.elixir_lang.module.ElixirModuleType"/>
-        <newProjectWizard.language implementation="org.elixir_lang.NewProjectWizard"/>
+        <newProjectWizard.languageGenerator implementation="org.elixir_lang.NewProjectWizard"/>
 
         <projectStructureDetector implementation="org.elixir_lang.module.ElixirProjectStructureDetector"/>
         <moduleConfigurationEditorProvider implementation="org.elixir_lang.module.DefaultModuleEditorsProvider"

src/org/elixir_lang/NewProjectWizard.kt

@@ -1,14 +1,15 @@
 package org.elixir_lang
 
-import com.intellij.ide.wizard.LanguageNewProjectWizard
-import com.intellij.ide.wizard.NewProjectWizardLanguageStep
 import com.intellij.ide.wizard.NewProjectWizardStep
+import com.intellij.ide.wizard.language.LanguageGeneratorNewProjectWizard
 import org.elixir_lang.new_project_wizard.Step
+import javax.swing.Icon
 
-class NewProjectWizard : LanguageNewProjectWizard {
+class NewProjectWizard : LanguageGeneratorNewProjectWizard {
     override val name: String = "Elixir"
     override val ordinal: Int = Int.MAX_VALUE
+    override val icon: Icon = Icons.LANGUAGE
 
-    override fun createStep(parent: NewProjectWizardLanguageStep): NewProjectWizardStep =
+    override fun createStep(parent: NewProjectWizardStep): NewProjectWizardStep =
         Step(parent)
 }

src/org/elixir_lang/new_project_wizard/Step.kt

@@ -7,7 +7,8 @@ import com.intellij.ide.JavaUiBundle
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.NewProjectWizardBaseData
-import com.intellij.ide.wizard.NewProjectWizardLanguageStep
+import com.intellij.ide.wizard.NewProjectWizardBaseData.Companion.baseData
+import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.diagnostic.Logger
@@ -39,10 +40,10 @@ import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
-// Based on [NewPythonProjectStep](https://github.com/JetBrains/intellij-community/blob/dcb0ce2edd2c3b1dffb7e60103898acd5b913cfb/python/src/com/jetbrains/python/newProject/PythonNewProjectWizard.kt#L82-L145)
-class Step(parent: NewProjectWizardLanguageStep) : AbstractNewProjectWizardStep(parent),
-                                                   NewProjectWizardBaseData by parent,
-                                                   Data {
+// Based on [NewPythonProjectStep](https://github.com/JetBrains/intellij-community/blob/7bb876b50c1601c8563c444d5f133dd19247e814/python/src/com/jetbrains/python/newProject/NewProjectWizardPythonData.kt#L74)
+class Step(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent),
+                                           NewProjectWizardBaseData by parent.baseData!!,
+                                           Data {
     override val sdkProperty = propertyGraph.property<Sdk?>(null)
     override val mixNewAppProperty = propertyGraph.property<String>("")
     override val mixNewModuleProperty = propertyGraph.property<String>("")