diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/IdeWizard.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/IdeWizard.kt index 78ac6eb923e..c9936b353e5 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/IdeWizard.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/IdeWizard.kt @@ -26,13 +26,10 @@ class IdeWizard( }, isUnitTestMode ) { - private val allSettings = plugins.flatMap { it.declaredSettings } val ideContext = IdeContext(context, servicesManager, isUnitTestMode) init { - with(valuesReadingContext) { - context.settingContext.apply { initPluginSettings(allSettings) } - } + initPluginSettingsDefaultValues() } var projectPath by setting(StructurePlugin::projectPath.reference) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt index 9703ccd26f1..0a2efde78dd 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt @@ -131,11 +131,6 @@ class SettingContext(val onUpdated: (SettingReference<*, *>) -> Unit) { onUpdated(reference) } - fun ReadingContext.initPluginSettings(settings: List>) { - for (setting in settings) { - setting.reference.savedOrDefaultValue?.let { values[setting.path] = it } - } - } val allPluginSettings: Collection> get() = pluginSettings.values diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt index 717417fd830..daa76c6abf6 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt @@ -37,7 +37,7 @@ abstract class Wizard(createPlugins: PluginsCreator, val servicesManager: Servic } } - private fun initPluginDefaultValues() { + protected fun initPluginSettingsDefaultValues() { with(settingsWritingContext) { for (setting in pluginSettings) { setting.reference.setSettingValueToItsDefaultIfItIsNotSetValue() @@ -72,7 +72,7 @@ abstract class Wizard(createPlugins: PluginsCreator, val servicesManager: Servic phases: Set, onTaskExecuting: (PipelineTask) -> Unit = {} ): TaskResult = computeM { - initPluginDefaultValues() + initPluginSettingsDefaultValues() initNonPluginDefaultValues() context.checkAllRequiredSettingPresent(phases).ensure() val taskRunningContext = WritingContext(context, servicesManager.withServices(services), isUnitTestMode)