From 38ec3ffb4a835614731b2a192517ae00be14056a Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 21 Jul 2020 16:26:14 +0300
Subject: [PATCH] [Gradle, JS] Statically calculated module configurator id

^KT-40527 fixed
---
 .../JsModuleConfigurator.kt                   | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt
index 947e439b508..666de727ea4 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt
@@ -84,14 +84,10 @@ interface JSConfigurator : ModuleConfiguratorWithModuleType, ModuleConfiguratorW
     }
 }
 
-enum class JsTarget {
-    BROWSER,
-    NODE;
-}
-
-abstract class JsSinglePlatformModuleConfigurator(
-    jsTarget: JsTarget
-) : JSConfigurator, ModuleConfiguratorWithTests, SinglePlatformModuleConfigurator,
+abstract class JsSinglePlatformModuleConfigurator :
+    JSConfigurator,
+    ModuleConfiguratorWithTests,
+    SinglePlatformModuleConfigurator,
     ModuleConfiguratorWithSettings {
     override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> =
         super<ModuleConfiguratorWithTests>.getConfiguratorSettings() +
@@ -102,9 +98,6 @@ abstract class JsSinglePlatformModuleConfigurator(
     @NonNls
     override val suggestedModuleName = "js"
 
-    @NonNls
-    override val id = "js${jsTarget.name.toLowerCase().capitalize()}SinglePlatform"
-
     override fun defaultTestFramework(): KotlinTestFramework = KotlinTestFramework.JS
 
     override val canContainSubModules = false
@@ -130,9 +123,10 @@ abstract class JsSinglePlatformModuleConfigurator(
     protected abstract fun GradleIRListBuilder.subTarget(module: Module, reader: Reader)
 }
 
-object BrowserJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigurator(
-    JsTarget.BROWSER
-) {
+object BrowserJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigurator() {
+    @NonNls
+    override val id = "jsBrowserSinglePlatform"
+
     override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> {
         return super.getConfiguratorSettings() +
                 JSConfigurator.cssSupport
@@ -145,9 +139,10 @@ object BrowserJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigu
     override val text = KotlinNewProjectWizardBundle.message("module.configurator.simple.js.browser")
 }
 
-object NodeJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigurator(
-    JsTarget.NODE
-) {
+object NodeJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigurator() {
+    @NonNls
+    override val id = "jsNodeSinglePlatform"
+
     override fun GradleIRListBuilder.subTarget(module: Module, reader: Reader) {
         nodejsSubTarget(module, reader)
     }