From c05c72387ed5f7562a86b486ae9c009289219611 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 22 Jul 2020 15:32:59 +0300
Subject: [PATCH] Wizard: fix node js templates

---
 .../projectWizard/plugins/AndroidPlugin.kt      |  3 ++-
 .../templates/SimpleNodeJsTemplatesPlugin.kt    | 17 ++++++++++++++++-
 .../projectTemplates/ProjectTemplate.kt         |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/AndroidPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/AndroidPlugin.kt
index f419a0cfd25..ed4f182c83e 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/AndroidPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/AndroidPlugin.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.tools.projectWizard.core.checker
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.Property
 import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.PluginSetting
+import org.jetbrains.kotlin.tools.projectWizard.core.service.FileSystemWizardService
 import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidModuleConfigurator
 import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.allIRModules
@@ -58,7 +59,7 @@ class AndroidPlugin(context: Context) : Plugin(context) {
                 if (allIRModules.none { it.originalModule.configurator is AndroidModuleConfigurator }) return@withAction UNIT_SUCCESS
                 val path = androidSdkPath.settingValue
                 val fileSystemService = service<FileSystemWizardService>()
-            GradlePlugin.localProperties.addValues(
+                GradlePlugin.localProperties.addValues(
                     "sdk.dir" to fileSystemService.renderPath(path)
                 )
             }
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt
index b8f902f0e2c..deddea4c341 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/SimpleNodeJsTemplatesPlugin.kt
@@ -6,9 +6,24 @@
 package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
 
 import org.jetbrains.kotlin.tools.projectWizard.core.Context
+import org.jetbrains.kotlin.tools.projectWizard.core.entity.PipelineTask
+import org.jetbrains.kotlin.tools.projectWizard.templates.KtorServerTemplate
 import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleJsClientTemplate
 import org.jetbrains.kotlin.tools.projectWizard.templates.SimpleNodeJsTemplate
 
 class SimpleNodeJsTemplatesPlugin(context: Context) : TemplatePlugin(context) {
-    val addTemplate by addTemplateTask(SimpleNodeJsTemplate())
+    override val path = PATH
+
+    override val pipelineTasks: List<PipelineTask> = super.pipelineTasks +
+            listOf(
+                KtorTemplatesPlugin.addTemplate,
+            )
+
+    val addTemplate by addTemplateTask(PATH, SimpleNodeJsTemplate())
+
+    companion object {
+        private const val PATH = "template.simpleNodeJs"
+
+        val addTemplate by addTemplateTask(PATH, KtorServerTemplate())
+    }
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
index 4b8eeb32dd5..a0668c3f231 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
@@ -403,7 +403,7 @@ object NodeJsApplicationProjectTemplate : ProjectTemplate() {
 
     override val setsPluginSettings: List<SettingWithValue<*, *>>
         get() = listOf(
-            KotlinPlugin::modules withValue listOf(
+            KotlinPlugin.modules.reference withValue listOf(
                 Module(
                     "nodejsApp",
                     NodeJsSinglePlatformModuleConfigurator,