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

Wizard: minor, remove unused functions

Browse Source
This commit is contained in:
Ilya Kirillov
2020-03-06 19:29:30 +03:00
parent 4ef01aea3f
commit 2fa0e7490f
3 changed files with 3 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/IdeWizard.kt
+1 -4
View File
@@ -26,13 +26,10 @@ class IdeWizard(
}, },
isUnitTestMode isUnitTestMode
) { ) {
private val allSettings = plugins.flatMap { it.declaredSettings }
val ideContext = IdeContext(context, servicesManager, isUnitTestMode) val ideContext = IdeContext(context, servicesManager, isUnitTestMode)
init { init {
with(valuesReadingContext) { initPluginSettingsDefaultValues()
context.settingContext.apply { initPluginSettings(allSettings) }
}
} }
var projectPath by setting(StructurePlugin::projectPath.reference) var projectPath by setting(StructurePlugin::projectPath.reference)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
-5
View File
@@ -131,11 +131,6 @@ class SettingContext(val onUpdated: (SettingReference<*, *>) -> Unit) {
onUpdated(reference) onUpdated(reference)
} }
fun ReadingContext.initPluginSettings(settings: List<PluginSetting<*, *>>) {
for (setting in settings) {
setting.reference.savedOrDefaultValue?.let { values[setting.path] = it }
}
}
val allPluginSettings: Collection<PluginSetting<*, *>> val allPluginSettings: Collection<PluginSetting<*, *>>
get() = pluginSettings.values get() = pluginSettings.values
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt
+2 -2
View File
@@ -37,7 +37,7 @@ abstract class Wizard(createPlugins: PluginsCreator, val servicesManager: Servic
} }
} }
private fun initPluginDefaultValues() { protected fun initPluginSettingsDefaultValues() {
with(settingsWritingContext) { with(settingsWritingContext) {
for (setting in pluginSettings) { for (setting in pluginSettings) {
setting.reference.setSettingValueToItsDefaultIfItIsNotSetValue() setting.reference.setSettingValueToItsDefaultIfItIsNotSetValue()
@@ -72,7 +72,7 @@ abstract class Wizard(createPlugins: PluginsCreator, val servicesManager: Servic
phases: Set<GenerationPhase>, phases: Set<GenerationPhase>,
onTaskExecuting: (PipelineTask) -> Unit = {} onTaskExecuting: (PipelineTask) -> Unit = {}
): TaskResult<Unit> = computeM { ): TaskResult<Unit> = computeM {
initPluginDefaultValues() initPluginSettingsDefaultValues()
initNonPluginDefaultValues() initNonPluginDefaultValues()
context.checkAllRequiredSettingPresent(phases).ensure() context.checkAllRequiredSettingPresent(phases).ensure()
val taskRunningContext = WritingContext(context, servicesManager.withServices(services), isUnitTestMode) val taskRunningContext = WritingContext(context, servicesManager.withServices(services), isUnitTestMode)