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

Wizard: move module templates to modules

Browse Source
This commit is contained in:
Ilya Kirillov
2020-01-16 20:27:49 +03:00
parent 5673804707
commit 0ebcf482ca
20 changed files with 221 additions and 199 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/ModuleSettingsComponent.kt
+13 -4
View File
@@ -1,5 +1,6 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.secondStep
import com.intellij.ui.components.JBTabbedPane
import com.intellij.ui.components.panels.VerticalLayout
import org.jetbrains.kotlin.tools.projectWizard.core.entity.StringValidators
import org.jetbrains.kotlin.tools.projectWizard.core.ValuesReadingContext
@@ -11,6 +12,7 @@ import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.*
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.components.DropDownComponent
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.components.TextFieldComponent
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.SettingsList
import java.awt.BorderLayout
import javax.swing.BorderFactory
import javax.swing.JComponent
@@ -19,7 +21,13 @@ class ModuleSettingsComponent(valuesReadingContext: ValuesReadingContext) : Dyna
StringValidators.shouldNotBeBlank("Module name") and
StringValidators.shouldBeValidIdentifier("Module Name")
private val moduleConfiguratorSettingsList = SettingsList(emptyList(), valuesReadingContext)
private val moduleConfiguratorSettingsList = SettingsList(emptyList(), valuesReadingContext).asSubComponent()
private val templateComponent = TemplatesComponent(valuesReadingContext).asSubComponent()
private val tabPanel = JBTabbedPane().apply {
add("Template", templateComponent.component)
add("Module Settings", moduleConfiguratorSettingsList.component)
}
private val nameField = TextFieldComponent(
valuesReadingContext,
@@ -32,15 +40,15 @@ class ModuleSettingsComponent(valuesReadingContext: ValuesReadingContext) : Dyna
).asSubComponent()
override val component: JComponent = panel(VerticalLayout(5)) {
override val component: JComponent = panel {
border = BorderFactory.createEmptyBorder(
UiConstants.GAP_BORDER_SIZE,
UiConstants.GAP_BORDER_SIZE,
UiConstants.GAP_BORDER_SIZE,
UiConstants.GAP_BORDER_SIZE
)
add(nameField.component)
add(moduleConfiguratorSettingsList.component)
add(nameField.component, BorderLayout.NORTH)
add(tabPanel, BorderLayout.CENTER)
}
var module: Module? = null
@@ -57,6 +65,7 @@ class ModuleSettingsComponent(valuesReadingContext: ValuesReadingContext) : Dyna
|| module.configurator.moduleType != ModuleType.common
moduleConfiguratorSettingsList.setSettings(module.configuratorSettings)
templateComponent.module = module
}
}
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/SourcesetSettingsComponent.kt
+1 -3
View File
@@ -6,10 +6,9 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.DynamicComponent
class SourcesetSettingsComponent(valuesReadingContext: ValuesReadingContext) : DynamicComponent(valuesReadingContext) {
private val templatesComponent = TemplatesComponent(valuesReadingContext).asSubComponent()
private val dependenciesComponent = SourcesetDependenciesSettingsComponent(valuesReadingContext).asSubComponent()
override val component = JBTabbedPane().apply {
add("Template", templatesComponent.component)
add("Dependencies", dependenciesComponent.component)
}
@@ -17,6 +16,5 @@ class SourcesetSettingsComponent(valuesReadingContext: ValuesReadingContext) : D
set(value) {
field = value
dependenciesComponent.sourceset = value
templatesComponent.sourceset = value
}
}
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/TemplatesComponent.kt
+12 -12
View File
@@ -10,6 +10,7 @@ import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.tools.projectWizard.core.ValuesReadingContext
import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset
import org.jetbrains.kotlin.tools.projectWizard.templates.Template
import org.jetbrains.kotlin.tools.projectWizard.templates.settings
@@ -23,7 +24,7 @@ import javax.swing.JPanel
class TemplatesComponent(valuesReadingContext: ValuesReadingContext) : DynamicComponent(valuesReadingContext) {
private val chooseTemplateComponent: ChooseTemplateComponent =
ChooseTemplateComponent(valuesReadingContext) { template ->
sourceset?.template = template
module?.template = template
switchState(template)
}
@@ -46,8 +47,8 @@ class TemplatesComponent(valuesReadingContext: ValuesReadingContext) : DynamicCo
when (selectedTemplate) {
null -> panel.add(chooseTemplateComponent.component, BorderLayout.CENTER)
else -> {
if (sourceset != null) {
templateSettingsComponent.setTemplate(sourceset!!, selectedTemplate)
if (module != null) {
templateSettingsComponent.setTemplate(module!!, selectedTemplate)
}
panel.add(templateSettingsComponent.component, BorderLayout.CENTER)
}
@@ -61,7 +62,7 @@ class TemplatesComponent(valuesReadingContext: ValuesReadingContext) : DynamicCo
override val component: JComponent = panel
var sourceset: Sourceset? = null
var module: Module? = null
set(value) {
field = value
switchState(value?.template)
@@ -95,7 +96,7 @@ class ChooseTemplateComponent(
TemplatesPlugin::templates.propertyValue
}
var selectedModule: Sourceset? = null
var selectedModule: Module? = null
set(value) {
field = value
onStateUpdated()
@@ -107,8 +108,7 @@ class ChooseTemplateComponent(
private val availableTemplates
get() = allTemplates.values.filter { template ->
selectedModule!!.containingModuleType in template.moduleTypes
&& selectedModule!!.sourcesetType in template.sourcesetTypes
selectedModule!!.configurator.moduleType in template.moduleTypes
&& template.isApplicableTo(selectedModule!!)
}
@@ -204,7 +204,7 @@ class TemplateDescriptionComponent(
}
private val title = panel {
nonDefaultBackgroundColor?.let { background = it }
nonDefaultBackgroundColor?.let { background = it }
add(titleLabel, BorderLayout.CENTER)
removeButton?.let { add(it, BorderLayout.EAST) }
}
@@ -213,7 +213,7 @@ class TemplateDescriptionComponent(
override val component: JComponent by lazy(LazyThreadSafetyMode.NONE) {
panel {
nonDefaultBackgroundColor?.let { background = it }
nonDefaultBackgroundColor?.let { background = it }
add(title, BorderLayout.NORTH)
add(descriptionLabel, BorderLayout.CENTER)
}
@@ -239,7 +239,7 @@ private class TemplateSettingsComponent(
) : DynamicComponent(valuesReadingContext) {
private val templateDescriptionComponent = TemplateDescriptionComponent(
needRemoveButton = true,
nonDefaultBackgroundColor = UIUtil.getEditorPaneBackground(),
nonDefaultBackgroundColor = UIUtil.getEditorPaneBackground(),
onRemoveButtonClicked = removeTemplate
).apply {
component.bordered(needTopEmptyBorder = false, needBottomEmptyBorder = false)
@@ -249,8 +249,8 @@ private class TemplateSettingsComponent(
component.bordered()
}
fun setTemplate(sourceset: Sourceset, selectedTemplate: Template) {
settings.setSettings(selectedTemplate.settings(sourceset))
fun setTemplate(module: Module, selectedTemplate: Template) {
settings.setSettings(selectedTemplate.settings(module))
templateDescriptionComponent.updateSelectedTemplate(selectedTemplate)
}
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/NewModuleCreator.kt
+3 -4
View File
@@ -28,7 +28,6 @@ class NewModuleCreator {
Sourceset(
sourcesetType,
configurator.moduleType,
template = null,
dependencies = emptyList()
)
}
@@ -57,7 +56,6 @@ class NewModuleCreator {
Sourceset(
sourcesetType,
ModuleType.jvm,
template = null,
dependencies = emptyList()
)
}
@@ -66,8 +64,9 @@ class NewModuleCreator {
name,
configurator.moduleKind,
configurator,
sourcesets,
emptyList()
template = null,
sourcesets = sourcesets,
subModules = emptyList()
)
createModule(createdModule)
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
+5 -6
View File
@@ -2,7 +2,6 @@ package org.jetbrains.kotlin.tools.projectWizard.core.entity
import org.jetbrains.kotlin.tools.projectWizard.Identificator
import org.jetbrains.kotlin.tools.projectWizard.core.*
import org.jetbrains.kotlin.tools.projectWizard.id
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.ModuleConfigurator
import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem
@@ -71,16 +70,16 @@ sealed class TemplateSettingReference<V : Any, T : SettingType<V>> : SettingRefe
get() = setting.type::class
override fun Context.getSetting(): Setting<V, T> = setting
abstract val sourceset: Sourceset?
abstract val module: Module?
}
data class SourcesetBasedTemplateSettingReference<V : Any, T : SettingType<V>>(
data class ModuleBasedTemplateSettingReference<V : Any, T : SettingType<V>>(
override val descriptor: Template,
override val sourceset: Sourceset,
override val module: Module,
override val setting: TemplateSetting<V, T>
) : TemplateSettingReference<V, T>() {
override val sourcesetId: Identificator
get() = sourceset.identificator
get() = module.identificator
}
data class IdBasedTemplateSettingReference<V : Any, T : SettingType<V>>(
@@ -88,7 +87,7 @@ data class IdBasedTemplateSettingReference<V : Any, T : SettingType<V>>(
override val sourcesetId: Identificator,
override val setting: TemplateSetting<V, T>
) : TemplateSettingReference<V, T>() {
override val sourceset: Sourceset? = null
override val module: Module? = null
}
inline val <V : Any, reified T : SettingType<V>> PluginSettingPropertyReference<V, T>.reference: PluginSettingReference<V, T>
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/ModuleIR.kt
+6 -2
View File
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.BuildFilePrinter
import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter
import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.MavenPrinter
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType
import org.jetbrains.kotlin.tools.projectWizard.templates.Template
@@ -13,14 +14,15 @@ import java.nio.file.Path
sealed class ModuleIR : IrsOwner, BuildSystemIR {
abstract val name: String
abstract val path: Path
abstract val template: Template?
abstract val type: ModuleType
abstract val originalModule: Module
}
interface SourcesetIR : BuildSystemIR {
val sourcesetType: SourcesetType
val path: Path
val template: Template?
val original: Sourceset
}
@@ -28,7 +30,9 @@ data class SingleplatformModuleIR(
override val name: String,
override val path: Path,
override val irs: List<BuildSystemIR>,
override val template: Template?,
override val type: ModuleType,
override val originalModule: Module,
val sourcesets: List<SingleplatformSourcesetIR>
) : ModuleIR() {
override fun withReplacedIrs(irs: List<BuildSystemIR>): SingleplatformModuleIR = copy(irs = irs)
@@ -51,7 +55,6 @@ data class SingleplatformSourcesetIR(
override val sourcesetType: SourcesetType,
override val path: Path,
override val irs: List<BuildSystemIR>,
override val template: Template?,
override val original: Sourceset
) : SourcesetIR, IrsOwner {
override fun withReplacedIrs(irs: List<BuildSystemIR>): SingleplatformSourcesetIR = copy(irs = irs)
@@ -65,6 +68,7 @@ data class SourcesetModuleIR(
override val type: ModuleType,
override val sourcesetType: SourcesetType,
override val template: Template?,
override val originalModule: Module,
override val original: Sourceset
) : SourcesetIR, GradleIR, ModuleIR() {
override fun withReplacedIrs(irs: List<BuildSystemIR>): SourcesetModuleIR = copy(irs = irs)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt
+1 -1
View File
@@ -104,7 +104,7 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
}
val createSettingsFileTask by pipelineTask(GenerationPhase.PROJECT_GENERATION) {
runBefore(TemplatesPlugin::addTemplatesToSourcesets)
runBefore(TemplatesPlugin::addTemplatesToModules)
activityChecker = isGradle
withAction {
val templateDescriptor = when (buildSystemType) {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt
+4 -2
View File
@@ -119,13 +119,14 @@ class ModulesToIRsConverter(
module.name,
modulePath,
dependenciesIRs,
module.template,
module.configurator.moduleType,
module,
module.sourcesets.map { sourceset ->
SingleplatformSourcesetIR(
sourceset.sourcesetType,
modulePath / Defaults.SRC_DIR / sourceset.sourcesetType.name,
sourceset.dependencies.map { it.toIR(sourceset.sourcesetType.toDependencyType()) },
sourceset.template,
sourceset
)
}
@@ -203,7 +204,8 @@ class ModulesToIRsConverter(
sourcesetIrs,
sourceset.containingModuleType,
sourceset.sourcesetType,
sourceset.template,
target.template,
target,
sourceset
)
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/templates/TemplatesPlugin.kt
+44 -38
View File
@@ -1,6 +1,9 @@
package org.jetbrains.kotlin.tools.projectWizard.plugins.templates
import org.jetbrains.kotlin.tools.projectWizard.core.*
import org.jetbrains.kotlin.tools.projectWizard.core.Defaults.KOTLIN_DIR
import org.jetbrains.kotlin.tools.projectWizard.core.Defaults.RESOURCES_DIR
import org.jetbrains.kotlin.tools.projectWizard.core.Defaults.SRC_DIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemPlugin
@@ -46,7 +49,7 @@ class TemplatesPlugin(context: Context) : Plugin(context) {
}
}
val addTemplatesToSourcesets by pipelineTask(GenerationPhase.PROJECT_GENERATION) {
val addTemplatesToModules by pipelineTask(GenerationPhase.PROJECT_GENERATION) {
runBefore(BuildSystemPlugin::createModules)
runAfter(KotlinPlugin::createModules)
@@ -54,30 +57,10 @@ class TemplatesPlugin(context: Context) : Plugin(context) {
val templateEngine = VelocityTemplateEngine()
updateBuildFiles { buildFile ->
buildFile.modules.modules.mapSequence { module ->
when (module) {
is SingleplatformModuleIR -> {
module.sourcesets.mapSequence { sourceset ->
applyTemplateToSourceset(
sourceset.template,
sourceset,
templateEngine
).map { result ->
result.copy(
librariesToAdd = result.librariesToAdd.map {
it.withDependencyType(sourceset.sourcesetType.toDependencyType())
}
)
}
}.map(List<TemplateApplicationResult>::fold)
}
is SourcesetModuleIR -> {
applyTemplateToSourceset(
module.template,
module,
templateEngine
)
}
}.map { result -> module.withIrs(result.librariesToAdd) to result }
applyTemplateToModule(
module.template,
module
).map { result -> module.withIrs(result.librariesToAdd) to result }
}.map {
val (moduleIrs, results) = it.unzip()
val foldedResults = results.fold()
@@ -95,25 +78,25 @@ class TemplatesPlugin(context: Context) : Plugin(context) {
}
}
val postApplyTemplatesToSourcesets by pipelineTask(GenerationPhase.PROJECT_GENERATION) {
val postApplyTemplatesToModules by pipelineTask(GenerationPhase.PROJECT_GENERATION) {
runBefore(BuildSystemPlugin::createModules)
runAfter(KotlinPlugin::createModules)
runAfter(TemplatesPlugin::addTemplatesToSourcesets)
runAfter(TemplatesPlugin::addTemplatesToModules)
withAction {
updateBuildFiles { buildFile ->
val sourcesets = buildFile.sourcesets
val modules = buildFile.modules.modules
val applicationState = sourcesets.mapNotNull { sourceset ->
sourceset.template?.createInterceptors(sourceset)
val applicationState = modules.mapNotNull { module ->
module.template?.createInterceptors(module)
}.flatten()
.applyAll(TemplateInterceptionApplicationState(buildFile, emptyMap()))
val templateEngine = VelocityTemplateEngine()
val templatesApplicationResult = sourcesets.map { sourceset ->
val settings = applicationState.sourcesetToSettings[sourceset.original.identificator].orEmpty()
applyFileTemplatesFromSourceset(sourceset, templateEngine, settings)
val templatesApplicationResult = modules.map { module ->
val settings = applicationState.moduleToSettings[module.originalModule.identificator].orEmpty()
applyFileTemplatesFromSourceset(module, templateEngine, settings)
}.sequenceIgnore()
templatesApplicationResult andThen applicationState.buildFileIR.asSuccess()
@@ -122,16 +105,39 @@ class TemplatesPlugin(context: Context) : Plugin(context) {
}
private fun TaskRunningContext.applyFileTemplatesFromSourceset(
sourceset: SourcesetIR,
module: ModuleIR,
templateEngine: TemplateEngine,
interceptionPointSettings: Map<InterceptionPoint<Any>, Any>
): TaskResult<Unit> {
val template = sourceset.template ?: return UNIT_SUCCESS
val settings = with(template) { settingsAsMap(sourceset.original) }
val template = module.template ?: return UNIT_SUCCESS
val settings = with(template) { settingsAsMap(module.originalModule) }
val allSettings = settings + interceptionPointSettings.mapKeys { it.key.name }
return with(template) { getFileTemplates(sourceset) }.map { fileTemplateDescriptor ->
val fileTemplate = FileTemplate(fileTemplateDescriptor, sourceset.path, allSettings)
return with(template) { getFileTemplates(module) }.mapNotNull { (fileTemplateDescriptor, filePath) ->
val path = generatePathForFileTemplate(module, filePath) ?: return@mapNotNull null
val fileTemplate = FileTemplate(
fileTemplateDescriptor,
module.path / path,
allSettings
)
with(templateEngine) { writeTemplate(fileTemplate) }
}.sequenceIgnore()
}
private fun generatePathForFileTemplate(module: ModuleIR, filePath: FilePath) = when (module) {
is SingleplatformModuleIR -> {
when (filePath) {
is SrcFilePath -> SRC_DIR / filePath.sourcesetType.toString() / KOTLIN_DIR
is ResourcesFilePath -> RESOURCES_DIR / filePath.sourcesetType.toString()
}
}
is SourcesetModuleIR -> {
if (filePath.sourcesetType == module.sourcesetType) {
when (filePath) {
is SrcFilePath -> KOTLIN_DIR
is ResourcesFilePath -> RESOURCES_DIR
}
} else null
}
}
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
+24 -25
View File
@@ -5,12 +5,10 @@ import org.jetbrains.kotlin.tools.projectWizard.core.buildList
import org.jetbrains.kotlin.tools.projectWizard.core.entity.*
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidSinglePlatformModuleConfigurator
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.MppModuleConfigurator
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.NativeForCurrentSystemTarget
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.defaultTarget
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ProjectKind
import org.jetbrains.kotlin.tools.projectWizard.projectTemplates.MultiplatformLibrary.withTemplate
import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.*
import org.jetbrains.kotlin.tools.projectWizard.templates.*
@@ -36,7 +34,7 @@ sealed class ProjectTemplate : DisplayableSettingItem {
}
fun <T : Template> Sourceset.withTemplate(
fun <T : Template> Module.withTemplate(
template: T,
createSettings: TemplateSettingsBuilder<T>.() -> Unit = {}
) = apply {
@@ -62,9 +60,9 @@ sealed class ProjectTemplate : DisplayableSettingItem {
}
class TemplateSettingsBuilder<Q : Template>(
val sourceset: Sourceset,
val module: Module,
val template: Q
) : TemplateEnvironment by SourcesetBasedTemplateEnvironment(template, sourceset) {
) : TemplateEnvironment by ModuleBasedTemplateEnvironment(template, module) {
private val settings = mutableListOf<SettingWithValue<*, *>>()
val setsSettings: List<SettingWithValue<*, *>>
get() = settings
@@ -89,7 +87,6 @@ private fun ModuleType.createDefaultSourcesets() =
Sourceset(
sourcesetType,
this,
template = null,
dependencies = emptyList()
)
}
@@ -138,7 +135,7 @@ object JvmConsoleApplication : ProjectTemplate() {
"consoleApp",
ModuleType.jvm.createDefaultSourcesets()
).apply {
mainSourceset?.withTemplate(ConsoleJvmApplicationTemplate())
withTemplate(ConsoleJvmApplicationTemplate())
}
)
)
@@ -161,22 +158,22 @@ object MultiplatformLibrary : ProjectTemplate() {
"library",
listOf(
ModuleType.common.createDefaultTarget().apply {
testSourceset?.withTemplate(KotlinTestTemplate()) {
template.framework withValue KotlinTestFramework.COMMON
template.generateDummyTest withValue false
}
// testSourceset?.withTemplate(KotlinTestTemplate()) {
// template.framework withValue KotlinTestFramework.COMMON
// template.generateDummyTest withValue false
// }
},
ModuleType.jvm.createDefaultTarget().apply {
testSourceset?.withTemplate(KotlinTestTemplate()) {
template.framework withValue KotlinTestFramework.JUNIT4
template.generateDummyTest withValue false
}
// testSourceset?.withTemplate(KotlinTestTemplate()) {
// template.framework withValue KotlinTestFramework.JUNIT4
// template.generateDummyTest withValue false
// }
},
ModuleType.js.createDefaultTarget().apply {
testSourceset?.withTemplate(KotlinTestTemplate()) {
template.framework withValue KotlinTestFramework.JS
template.generateDummyTest withValue false
}
// testSourceset?.withTemplate(KotlinTestTemplate()) {
// template.framework withValue KotlinTestFramework.JS
// template.generateDummyTest withValue false
// }
},
ModuleType.native.createDefaultTarget()
)
@@ -197,12 +194,12 @@ object JvmServerJsClient : ProjectTemplate() {
"application",
listOf(
ModuleType.jvm.createDefaultTarget().apply {
mainSourceset?.withTemplate(KtorServerTemplate()) {
withTemplate(KtorServerTemplate()) {
template.serverEngine withValue KtorServerEngine.Netty
}
},
ModuleType.js.createDefaultTarget().apply {
mainSourceset?.withTemplate(SimpleJsClientTemplate())
withTemplate(SimpleJsClientTemplate())
}
)
)
@@ -226,8 +223,9 @@ object AndroidApplication : ProjectTemplate() {
"app",
ModuleKind.singleplatform,
AndroidSinglePlatformModuleConfigurator,
SourcesetType.ALL.map { type ->
Sourceset(type, ModuleType.jvm, template = null, dependencies = emptyList())
template = null,
sourcesets = SourcesetType.ALL.map { type ->
Sourceset(type, ModuleType.jvm, dependencies = emptyList())
},
subModules = emptyList()
)
@@ -248,10 +246,11 @@ object NativeConsoleApplication : ProjectTemplate() {
"app",
ModuleKind.multiplatform,
MppModuleConfigurator,
emptyList(),
template = null,
sourcesets = emptyList(),
subModules = listOf(
ModuleType.native.createDefaultTarget("native").apply {
mainSourceset?.withTemplate(NativeConsoleApplicationTemplate())
withTemplate(NativeConsoleApplicationTemplate())
}
)
)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt
+18 -3
View File
@@ -7,6 +7,7 @@ import org.jetbrains.kotlin.tools.projectWizard.core.*
import org.jetbrains.kotlin.tools.projectWizard.core.entity.*
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.*
import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem
import org.jetbrains.kotlin.tools.projectWizard.templates.Template
@Suppress("EnumEntryName")
enum class ModuleKind {
@@ -20,6 +21,7 @@ class Module(
var name: String,
val kind: ModuleKind,
var configurator: ModuleConfigurator,
var template: Template?,
val sourcesets: List<Sourceset>,
subModules: List<Module>,
var parent: Module? = null,
@@ -38,8 +40,15 @@ class Module(
setting.validator.validate(this@settingValidator, value)
}.fold()
}
} and inValidatorContext { module ->
validateList(module.sourcesets)
} and settingValidator { module ->
val template = module.template ?: return@settingValidator ValidationResult.OK
org.jetbrains.kotlin.tools.projectWizard.templates.withSettingsOf(module) {
template.settings.map { setting ->
val value = setting.reference.notRequiredSettingValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
setting.validator.validate(this@settingValidator, value)
}.fold()
}
} and inValidatorContext { module ->
validateList(module.subModules)
}
@@ -72,6 +81,9 @@ class Module(
val identificator = GeneratedIdentificator(name)
val (kind) = map.parseValue<ModuleKind>(this, path, "kind", enumParser())
val (configurator) = map.parseValue(this, path, "type", ModuleConfigurator.getParser(identificator))
val template = map["template"]?.let {
Template.parser(identificator).parse(this, it, "$path.template")
}.nullableValue()
val (sourcesets) = map.parseValue(
this,
path,
@@ -79,7 +91,7 @@ class Module(
listParser(Sourceset.parser(configurator.moduleType))
) { emptyList() }
val (submodules) = map.parseValue(this, path, "subModules", listParser(Module.parser)) { emptyList() }
Module(name, kind, configurator, sourcesets, submodules, identificator = identificator)
Module(name, kind, configurator, template, sourcesets, submodules, identificator = identificator)
}
}
@@ -111,6 +123,7 @@ fun MultiplatformTargetModule(name: String, configurator: ModuleConfigurator, so
name,
ModuleKind.target,
configurator,
null,
sourcesets,
emptyList()
)
@@ -121,6 +134,7 @@ fun MultiplatformModule(name: String, targets: List<Module> = emptyList()) =
name,
ModuleKind.multiplatform,
MppModuleConfigurator,
null,
emptyList(),
targets
)
@@ -131,6 +145,7 @@ fun SingleplatformModule(name: String, sourcesets: List<Sourceset>) =
name,
ModuleKind.singleplatform,
JvmSinglePlatformModuleConfigurator,
null,
sourcesets,
emptyList()
)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Sourceset.kt
+2 -16
View File
@@ -36,21 +36,10 @@ data class PathBasedSourcesetDependency(val path: ModulePath) : SourcesetDepende
class Sourceset(
val sourcesetType: SourcesetType,
val containingModuleType: ModuleType,
var template: Template?,
var dependencies: List<SourcesetDependency>,
var parent: Module? = null,
override val identificator: Identificator = GeneratedIdentificator(sourcesetType.name)
) : DisplayableSettingItem, Validatable<Sourceset>, IdentificatorOwner {
override val validator: SettingValidator<Sourceset> = settingValidator { sourceset ->
val template = sourceset.template ?: return@settingValidator ValidationResult.OK
withSettingsOf(sourceset) {
template.settings.map { setting ->
val value = setting.reference.notRequiredSettingValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
setting.validator.validate(this@settingValidator, value)
}.fold()
}
}
) : DisplayableSettingItem, IdentificatorOwner {
override val text: String get() = sourcesetType.name
override val greyText: String? get() = null
@@ -64,11 +53,8 @@ class Sourceset(
"dependencies",
listParser(PathBasedSourcesetDependency.parser)
) { emptyList() }
val template = map["template"]?.let {
Template.parser(identificator).parse(this, it, "$path.template")
}.nullableValue()
Sourceset(sourcesetType, moduleType, template, dependencies, identificator = identificator)
Sourceset(sourcesetType, moduleType, dependencies, identificator = identificator)
}
}
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/ConsoleJvmApplicationTemplate.kt
+6 -6
View File
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.tools.projectWizard.templates
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
import org.jetbrains.kotlin.tools.projectWizard.core.TaskRunningContext
import org.jetbrains.kotlin.tools.projectWizard.core.asPath
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.TargetConfigurationIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.addWithJavaIntoJvmTarget
@@ -15,19 +16,18 @@ class ConsoleJvmApplicationTemplate : Template() {
Console JVM module with main method and run task generated
""".trimIndent()
override val moduleTypes: Set<ModuleType> = setOf(ModuleType.jvm)
override val sourcesetTypes: Set<SourcesetType> = setOf(SourcesetType.main)
override fun TaskRunningContext.getIrsToAddToBuildFile(
sourceset: SourcesetIR
module: ModuleIR
) = buildList<BuildSystemIR> {
+runTaskIrs("MainKt")
}
override fun updateTargetIr(sourceset: SourcesetIR, targetConfigurationIR: TargetConfigurationIR): TargetConfigurationIR =
override fun updateTargetIr(module: ModuleIR, targetConfigurationIR: TargetConfigurationIR): TargetConfigurationIR =
targetConfigurationIR.addWithJavaIntoJvmTarget()
override fun TaskRunningContext.getFileTemplates(sourceset: SourcesetIR) =
buildList<FileTemplateDescriptor> {
+FileTemplateDescriptor("$id/main.kt.vm", sourcesPath("main.kt"))
override fun TaskRunningContext.getFileTemplates(module: ModuleIR) =
buildList<FileTemplateDescriptorWithPath> {
+(FileTemplateDescriptor("$id/main.kt.vm", "main.kt".asPath()) asSrcOf SourcesetType.main)
}
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/FileTemplateDescriptor.kt
+18 -9
View File
@@ -1,7 +1,6 @@
package org.jetbrains.kotlin.tools.projectWizard.templates
import org.jetbrains.kotlin.tools.projectWizard.core.Defaults
import org.jetbrains.kotlin.tools.projectWizard.core.div
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType
import java.nio.file.Path
@@ -9,6 +8,22 @@ import java.nio.file.Path
// Except build files as they will be generated using IR
data class FileTemplateDescriptor(val templateId: String, val relativePath: Path)
sealed class FilePath {
abstract val sourcesetType: SourcesetType
}
data class SrcFilePath(override val sourcesetType: SourcesetType) : FilePath()
data class ResourcesFilePath(override val sourcesetType: SourcesetType) : FilePath()
data class FileTemplateDescriptorWithPath(val descriptor: FileTemplateDescriptor, val path: FilePath)
infix fun FileTemplateDescriptor.asResourceOf(sourcesetType: SourcesetType) =
FileTemplateDescriptorWithPath(this, ResourcesFilePath(sourcesetType))
infix fun FileTemplateDescriptor.asSrcOf(sourcesetType: SourcesetType) =
FileTemplateDescriptorWithPath(this, SrcFilePath(sourcesetType))
data class FileTemplate(
val descriptor: FileTemplateDescriptor,
val rootPath: Path,
@@ -16,10 +31,4 @@ data class FileTemplate(
) {
constructor(descriptor: FileTemplateDescriptor, rootPath: Path, vararg data: Pair<String, Any?>) :
this(descriptor, rootPath, data.toMap())
}
fun resourcesPath(fileName: String) =
Defaults.RESOURCES_DIR / fileName
fun sourcesPath(fileName: String) =
Defaults.KOTLIN_DIR / fileName
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KotlinTestTemplate.kt
+8 -9
View File
@@ -23,26 +23,25 @@ class KotlinTestTemplate : Template() {
| More information can be found <a href='https://kotlinlang.org/api/latest/kotlin.test/index.html'>here</a>
""".trimMargin()
override val moduleTypes = setOf(ModuleType.common, ModuleType.js, ModuleType.jvm)
override val sourcesetTypes = setOf(SourcesetType.test)
override fun TaskRunningContext.getRequiredLibraries(sourceset: SourcesetIR): List<DependencyIR> =
withSettingsOf(sourceset.original) {
override fun TaskRunningContext.getRequiredLibraries(module: ModuleIR): List<DependencyIR> =
withSettingsOf(module.originalModule) {
framework.reference.settingValue.dependencyNames.map { dependencyName ->
KotlinArbitraryDependencyIR(
dependencyName,
isInMppModule = sourceset.original.parent?.kind
?.let { it == ModuleKind.multiplatform || it == ModuleKind.target } != false,
isInMppModule = module.originalModule.kind
.let { it == ModuleKind.multiplatform || it == ModuleKind.target },
version = KotlinPlugin::version.settingValue,
dependencyType = DependencyType.MAIN
)
}
}
override fun TaskRunningContext.getFileTemplates(sourceset: SourcesetIR): List<FileTemplateDescriptor> =
withSettingsOf(sourceset.original) {
override fun TaskRunningContext.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> =
withSettingsOf(module.originalModule) {
buildList {
if (generateDummyTest.reference.settingValue) {
+FileTemplateDescriptor("kotlinTestFramework/dummyTest.kt.vm", sourcesPath("Test.kt"))
+(FileTemplateDescriptor("kotlinTestFramework/dummyTest.kt.vm", "Test.kt".asPath()) asSrcOf SourcesetType.main)
}
}
}
@@ -54,7 +53,7 @@ class KotlinTestTemplate : Template() {
filter = filter@{ reference, kotlinTestFramework ->
if (reference !is TemplateSettingReference) return@filter true
val moduleType = reference.sourceset?.containingModuleType
val moduleType = reference.module?.configurator?.moduleType
kotlinTestFramework.moduleType == moduleType
}
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
+7 -7
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.tools.projectWizard.templates
import org.jetbrains.kotlin.tools.projectWizard.core.TaskRunningContext
import org.jetbrains.kotlin.tools.projectWizard.core.asPath
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
import org.jetbrains.kotlin.tools.projectWizard.core.entity.TemplateSetting
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
@@ -25,11 +26,10 @@ class KtorServerTemplate : Template() {
override val title: String = "Ktor-based Server"
override val htmlDescription: String = title
override val moduleTypes: Set<ModuleType> = setOf(ModuleType.jvm)
override val sourcesetTypes: Set<SourcesetType> = setOf(SourcesetType.main)
override val id: String = "ktorServer"
override fun TaskRunningContext.getRequiredLibraries(sourceset: SourcesetIR): List<DependencyIR> =
withSettingsOf(sourceset.original) {
override fun TaskRunningContext.getRequiredLibraries(module: ModuleIR): List<DependencyIR> =
withSettingsOf(module.originalModule) {
buildList {
+ktorArtifactDependency(serverEngine.reference.settingValue.dependencyName)
+ktorArtifactDependency("ktor-html-builder")
@@ -41,17 +41,17 @@ class KtorServerTemplate : Template() {
}
}
override fun TaskRunningContext.getIrsToAddToBuildFile(sourceset: SourcesetIR): List<BuildSystemIR> = buildList {
override fun TaskRunningContext.getIrsToAddToBuildFile(module: ModuleIR): List<BuildSystemIR> = buildList {
+RepositoryIR(Repositories.KTOR_BINTRAY)
+RepositoryIR(DefaultRepository.JCENTER)
+runTaskIrs(mainClass = "ServerKt")
}
override fun updateTargetIr(sourceset: SourcesetIR, targetConfigurationIR: TargetConfigurationIR): TargetConfigurationIR =
override fun updateTargetIr(module: ModuleIR, targetConfigurationIR: TargetConfigurationIR): TargetConfigurationIR =
targetConfigurationIR.addWithJavaIntoJvmTarget()
override fun TaskRunningContext.getFileTemplates(sourceset: SourcesetIR): List<FileTemplateDescriptor> = listOf(
FileTemplateDescriptor("$id/server.kt.vm", sourcesPath("server.kt"))
override fun TaskRunningContext.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> = listOf(
FileTemplateDescriptor("$id/server.kt.vm", "server.kt".asPath()) asSrcOf SourcesetType.main
)
val serverEngine by enumSetting<KtorServerEngine>("Ktor Server", GenerationPhase.PROJECT_GENERATION)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/NativeConsoleApplicationTemplate.kt
+5 -4
View File
@@ -6,7 +6,9 @@
package org.jetbrains.kotlin.tools.projectWizard.templates
import org.jetbrains.kotlin.tools.projectWizard.core.TaskRunningContext
import org.jetbrains.kotlin.tools.projectWizard.core.asPath
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.SourcesetIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.NativeTargetInternalIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.TargetConfigurationIR
@@ -18,13 +20,12 @@ class NativeConsoleApplicationTemplate : Template() {
override val title: String = "Native Console Application"
override val htmlDescription: String = title
override val moduleTypes: Set<ModuleType> = setOf(ModuleType.native)
override val sourcesetTypes: Set<SourcesetType> = setOf(SourcesetType.main)
override val id: String = "nativeConsoleApp"
override fun updateTargetIr(sourceset: SourcesetIR, targetConfigurationIR: TargetConfigurationIR): TargetConfigurationIR =
override fun updateTargetIr(module: ModuleIR, targetConfigurationIR: TargetConfigurationIR): TargetConfigurationIR =
targetConfigurationIR.withIrs(NativeTargetInternalIR("main"))
override fun TaskRunningContext.getFileTemplates(sourceset: SourcesetIR): List<FileTemplateDescriptor> = buildList {
+FileTemplateDescriptor("$id/main.kt.vm", sourcesPath("main.kt"))
override fun TaskRunningContext.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> = buildList {
+(FileTemplateDescriptor("$id/main.kt.vm", "main.kt".asPath()) asSrcOf SourcesetType.main)
}
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
+12 -11
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.tools.projectWizard.templates
import org.jetbrains.kotlin.tools.projectWizard.core.TaskRunningContext
import org.jetbrains.kotlin.tools.projectWizard.core.asPath
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
import org.jetbrains.kotlin.tools.projectWizard.core.safeAs
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
@@ -16,6 +17,7 @@ import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.JsBrowserTar
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleSubType
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.DefaultRepository
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType
import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
@@ -26,13 +28,12 @@ class SimpleJsClientTemplate : Template() {
override val title: String = "Simple JS client"
override val htmlDescription: String = title
override val moduleTypes: Set<ModuleType> = setOf(ModuleType.js)
override val sourcesetTypes: Set<SourcesetType> = setOf(SourcesetType.main)
override val id: String = "simpleJsClient"
override fun isApplicableTo(sourceset: Sourceset): Boolean =
sourceset.parent?.configurator == JsBrowserTargetConfigurator
override fun isApplicableTo(module: Module): Boolean =
module.configurator == JsBrowserTargetConfigurator
override fun TaskRunningContext.getRequiredLibraries(sourceset: SourcesetIR): List<DependencyIR> =
override fun TaskRunningContext.getRequiredLibraries(module: ModuleIR): List<DependencyIR> =
buildList {
+ArtifactBasedLibraryDependencyIR(
MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-js"),
@@ -41,11 +42,11 @@ class SimpleJsClientTemplate : Template() {
)
}
override fun TaskRunningContext.getFileTemplates(sourceset: SourcesetIR): List<FileTemplateDescriptor> = listOf(
FileTemplateDescriptor("$id/client.kt.vm", sourcesPath("client.kt"))
override fun TaskRunningContext.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> = listOf(
FileTemplateDescriptor("$id/client.kt.vm", "client.kt".asPath()) asSrcOf SourcesetType.main
)
override fun createInterceptors(sourceset: SourcesetIR): List<TemplateInterceptor> = buildList {
override fun createInterceptors(module: ModuleIR): List<TemplateInterceptor> = buildList {
+interceptTemplate(KtorServerTemplate()) {
applicableIf { buildFileIR ->
val tasks = buildFileIR.irsOfTypeOrNull<GradleConfigureTaskIR>() ?: return@applicableIf false
@@ -82,7 +83,7 @@ class SimpleJsClientTemplate : Template() {
}
transformBuildFile { buildFileIR ->
val jsSourcesetName = sourceset.safeAs<SourcesetModuleIR>()?.targetName ?: return@transformBuildFile null
val jsSourcesetName = module.safeAs<SourcesetModuleIR>()?.targetName ?: return@transformBuildFile null
val jvmTarget = buildFileIR.targets.firstOrNull { target ->
target.safeAs<DefaultTargetConfigurationIR>()?.targetAccess?.type == ModuleSubType.jvm
} as? DefaultTargetConfigurationIR ?: return@transformBuildFile null
@@ -133,12 +134,12 @@ class SimpleJsClientTemplate : Template() {
}
override fun TaskRunningContext.getIrsToAddToBuildFile(sourceset: SourcesetIR): List<BuildSystemIR> = buildList {
override fun TaskRunningContext.getIrsToAddToBuildFile(module: ModuleIR): List<BuildSystemIR> = buildList {
+RepositoryIR(DefaultRepository.JCENTER)
if (sourceset is SourcesetModuleIR) {
if (module is SourcesetModuleIR) {
+GradleImportIR("org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack")
val taskAccessIR = GradleByNameTaskAccessIR(
"${sourceset.targetName}BrowserWebpack",
"${module.name}BrowserWebpack",
WEBPACK_TASK_CLASS
)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/Template.kt
+26 -30
View File
@@ -6,13 +6,11 @@ import org.jetbrains.kotlin.tools.projectWizard.core.*
import org.jetbrains.kotlin.tools.projectWizard.core.entity.*
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.TargetConfigurationIR
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.TargetConfigurator
import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
import org.jetbrains.kotlin.tools.projectWizard.plugins.StructurePlugin
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.InterceptionPoint
import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.TemplateInterceptor
@@ -25,25 +23,25 @@ interface TemplateEnvironment {
class IdBasedTemplateEnvironment(
private val template: Template,
private val sourcesetId: Identificator
private val moduleId: Identificator
) : TemplateEnvironment {
override val <V : Any, T : SettingType<V>> TemplateSetting<V, T>.reference
get() = IdBasedTemplateSettingReference(template, sourcesetId, this)
get() = IdBasedTemplateSettingReference(template, moduleId, this)
}
class SourcesetBasedTemplateEnvironment<Q : Template>(
class ModuleBasedTemplateEnvironment<Q : Template>(
val template: Q,
private val sourceset: Sourceset
private val module: Module
) : TemplateEnvironment {
override val <V : Any, T : SettingType<V>> TemplateSetting<V, T>.reference
get() = SourcesetBasedTemplateSettingReference(template, sourceset, this)
get() = ModuleBasedTemplateSettingReference(template, module, this)
}
fun <T> withSettingsOf(
sourceset: Sourceset,
template: Template = sourceset.template!!,
module: Module,
template: Template = module.template!!,
function: TemplateEnvironment.() -> T
): T = function(SourcesetBasedTemplateEnvironment(template, sourceset))
): T = function(ModuleBasedTemplateEnvironment(template, module))
fun <T> withSettingsOf(
identificator: Identificator,
@@ -62,38 +60,37 @@ abstract class Template : SettingsOwner {
abstract val title: String
abstract val htmlDescription: String
abstract val moduleTypes: Set<ModuleType>
abstract val sourcesetTypes: Set<SourcesetType>
open fun isApplicableTo(sourceset: Sourceset): Boolean = true
open fun isApplicableTo(module: Module): Boolean = true
open val settings: List<TemplateSetting<*, *>> = emptyList()
open val interceptionPoints: List<InterceptionPoint<Any>> = emptyList()
open fun TaskRunningContext.getRequiredLibraries(sourceset: SourcesetIR): List<DependencyIR> = emptyList()
open fun TaskRunningContext.getRequiredLibraries(module: ModuleIR): List<DependencyIR> = emptyList()
//TODO: use setting reading context
open fun TaskRunningContext.getIrsToAddToBuildFile(
sourceset: SourcesetIR
module: ModuleIR
): List<BuildSystemIR> = emptyList()
open fun updateTargetIr(
sourceset: SourcesetIR,
module: ModuleIR,
targetConfigurationIR: TargetConfigurationIR
): TargetConfigurationIR = targetConfigurationIR
open fun TaskRunningContext.getFileTemplates(sourceset: SourcesetIR): List<FileTemplateDescriptor> = emptyList()
open fun TaskRunningContext.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> = emptyList()
open fun createInterceptors(sourceset: SourcesetIR): List<TemplateInterceptor> = emptyList()
open fun createInterceptors(module: ModuleIR): List<TemplateInterceptor> = emptyList()
fun TaskRunningContext.applyToSourceset(
sourceset: SourcesetIR
module: ModuleIR
): TaskResult<TemplateApplicationResult> {
val librariesToAdd = getRequiredLibraries(sourceset)
val irsToAddToBuildFile = getIrsToAddToBuildFile(sourceset)
val librariesToAdd = getRequiredLibraries(module)
val irsToAddToBuildFile = getIrsToAddToBuildFile(module)
val targetsUpdater = when (sourceset) {
val targetsUpdater = when (module) {
is SourcesetModuleIR -> { target: TargetConfigurationIR ->
if (target.targetName == sourceset.targetName) updateTargetIr(sourceset, target)
if (target.targetName == module.name) updateTargetIr(module, target)
else target
}
else -> idFunction()
@@ -103,8 +100,8 @@ abstract class Template : SettingsOwner {
return result.asSuccess()
}
fun TaskRunningContext.settingsAsMap(sourceset: Sourceset): Map<String, Any> =
withSettingsOf(sourceset) {
fun TaskRunningContext.settingsAsMap(module: Module): Map<String, Any> =
withSettingsOf(module) {
settings.associate { setting ->
setting.path to setting.reference.settingValue
}
@@ -233,18 +230,17 @@ abstract class Template : SettingsOwner {
}
}
fun Template.settings(sourceset: Sourceset) = withSettingsOf(sourceset) {
fun Template.settings(module: Module) = withSettingsOf(module) {
settings.map { it.reference }
}
fun TaskRunningContext.applyTemplateToSourceset(
fun TaskRunningContext.applyTemplateToModule(
template: Template?,
sourceset: SourcesetIR,
templateEngine: TemplateEngine
module: ModuleIR
): TaskResult<TemplateApplicationResult> = when (template) {
null -> TemplateApplicationResult.EMPTY.asSuccess()
else -> with(template) {
applyToSourceset(sourceset)
applyToSourceset(module)
}
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/transformers/interceptors/Interceptor.kt
+6 -7
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors
import org.jetbrains.kotlin.tools.projectWizard.Identificator
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.BuildFileIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.sourcesets
import org.jetbrains.kotlin.tools.projectWizard.templates.Template
import org.jetbrains.kotlin.tools.projectWizard.transformers.Predicate
import org.jetbrains.kotlin.tools.projectWizard.transformers.TransformerFunction
@@ -19,7 +18,7 @@ typealias SourcesetInterceptionPointValues = Map<Identificator, InterceptionPoin
data class TemplateInterceptionApplicationState(
val buildFileIR: BuildFileIR,
val sourcesetToSettings: SourcesetInterceptionPointValues
val moduleToSettings: SourcesetInterceptionPointValues
)
data class TemplateInterceptor(
@@ -31,14 +30,14 @@ data class TemplateInterceptor(
fun applyTo(state: TemplateInterceptionApplicationState): TemplateInterceptionApplicationState {
if (applicabilityCheckers.any { checker -> !checker(state.buildFileIR) }) return state
val sourcesetsWithTemplate = state.buildFileIR.sourcesets.filter { it.template?.id == template.id }
if (sourcesetsWithTemplate.isEmpty()) return state
val modulesWithTemplate = state.buildFileIR.modules.modules.filter { it.template?.id == template.id }
if (modulesWithTemplate.isEmpty()) return state
val transformedBuildFile = applyBuildFileTransformers(state.buildFileIR)
val mutableValues = state.sourcesetToSettings.toMutableMap()
for (sourceset in sourcesetsWithTemplate) {
mutableValues.compute(sourceset.original.identificator) { _, values ->
val mutableValues = state.moduleToSettings.toMutableMap()
for (module in modulesWithTemplate) {
mutableValues.compute(module.originalModule.identificator) { _, values ->
applyInterceptionPointModifiers(values.orEmpty())
}
}