Wizard: remove module types for some module configurators

#KT-36176 fixed

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleSettingsComponent.kt

@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.idea.projectWizard.UiEditorUsageStats
 import org.jetbrains.kotlin.tools.projectWizard.core.ValuesReadingContext
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.StringValidators
 import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.configuratorSettings
+import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.moduleType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module.Companion.ALLOWED_SPECIAL_CHARS_IN_MODULE_NAMES

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/TemplatesComponent.kt

@@ -10,6 +10,7 @@ import com.intellij.util.ui.UIUtil
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.projectWizard.UiEditorUsageStats
 import org.jetbrains.kotlin.tools.projectWizard.core.ValuesReadingContext
+import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.moduleType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
 import org.jetbrains.kotlin.tools.projectWizard.templates.Template

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/CreateModuleOrTargetPopup.kt

@@ -1,5 +1,6 @@
 package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.secondStep.modulesEditor
 
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.ui.popup.ListPopup
 import com.intellij.openapi.ui.popup.PopupStep
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep
@@ -71,7 +72,7 @@ class CreateModuleOrTargetPopup private constructor(
     ) {
         override fun getIconFor(value: DisplayableSettingItem): Icon? = when (value) {
             is DisplayableTargetConfiguratorGroup -> value.moduleType.icon
-            is ModuleConfigurator -> value.moduleType.icon
+            is ModuleConfigurator -> value.moduleType?.icon ?: AllIcons.Nodes.Module
             else -> null
         }
 

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/NewModuleCreator.kt

@@ -27,7 +27,6 @@ class NewModuleCreator {
         SourcesetType.values().map { sourcesetType ->
             Sourceset(
                 sourcesetType,
-                configurator.moduleType,
                 dependencies = emptyList()
             )
         }
@@ -57,7 +56,6 @@ class NewModuleCreator {
                 else -> SourcesetType.values().map { sourcesetType ->
                     Sourceset(
                         sourcesetType,
-                        ModuleType.jvm,
                         dependencies = emptyList()
                     )
                 }

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt

@@ -89,7 +89,7 @@ val ModuleType.icon: Icon
 
 val Module.icon: Icon
     get() = when (kind) {
-        ModuleKind.target -> configurator.moduleType.icon
+        ModuleKind.target -> (configurator as TargetConfigurator).moduleType.icon
         ModuleKind.multiplatform -> AllIcons.Nodes.Module
         ModuleKind.singleplatformJs -> KotlinIcons.JS
         ModuleKind.singleplatformJvm -> AllIcons.Nodes.Module