azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Different module kind for browser and nodejs

Browse Source 
^KT-40527 fixed
This commit is contained in:
Ilya Goncharov
2020-07-21 17:10:48 +03:00
parent 38ec3ffb4a
commit ae0bedd2ac
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/ModulesEditorToolbarDecorator.kt
+4 -2
View File
@@ -65,7 +65,8 @@ class ModulesEditorToolbarDecorator(
val moduleKindTextToAdd = when (tree.selectedSettingItem?.safeAs<Module>()?.kind) {
ModuleKind.multiplatform -> KotlinNewProjectWizardBundle.message("module.kind.target")
ModuleKind.singleplatformJvm -> KotlinNewProjectWizardBundle.message("module.kind.module")
ModuleKind.singleplatformJs -> KotlinNewProjectWizardBundle.message("module.kind.js.module")
ModuleKind.singleplatformJsBrowser -> KotlinNewProjectWizardBundle.message("module.kind.js.browser.module")
ModuleKind.singleplatformJsNode -> KotlinNewProjectWizardBundle.message("module.kind.js.node.module")
ModuleKind.singleplatformAndroid -> KotlinNewProjectWizardBundle.message("module.kind.android.module")
ModuleKind.target -> ""
null -> ""
@@ -138,7 +139,8 @@ private val Module.kindText
get() = when (kind) {
ModuleKind.multiplatform -> KotlinNewProjectWizardBundle.message("module.kind.module")
ModuleKind.singleplatformJvm -> KotlinNewProjectWizardBundle.message("module.kind.module")
ModuleKind.singleplatformJs -> KotlinNewProjectWizardBundle.message("module.kind.module")
ModuleKind.singleplatformJsBrowser -> KotlinNewProjectWizardBundle.message("module.kind.module")
ModuleKind.singleplatformJsNode -> KotlinNewProjectWizardBundle.message("module.kind.module")
ModuleKind.singleplatformAndroid -> KotlinNewProjectWizardBundle.message("module.kind.android.module")
ModuleKind.target -> KotlinNewProjectWizardBundle.message("module.kind.target")
}
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt
+2 -2
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.tools.projectWizard.core.entity.ValidationResult
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.*
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleSubType
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ProjectKind
import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind
@@ -95,7 +94,8 @@ val ModuleSubType.icon: Icon
val ModuleKind.icon: Icon
get() = when (this) {
ModuleKind.multiplatform -> KotlinIcons.MPP
ModuleKind.singleplatformJs -> KotlinIcons.Wizard.JS
ModuleKind.singleplatformJsBrowser -> KotlinIcons.Wizard.JS
ModuleKind.singleplatformJsNode -> KotlinIcons.Wizard.NODE_JS
ModuleKind.singleplatformJvm -> KotlinIcons.Wizard.JVM
ModuleKind.target -> AllIcons.Nodes.Module
ModuleKind.singleplatformAndroid -> KotlinIcons.Wizard.ANDROID