diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/Parser.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/Parser.kt index 3a6cf0e4cdc..aecfb9c6ad1 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/Parser.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/Parser.kt @@ -25,14 +25,6 @@ abstract class Parser { abstract fun ParsingContext.parse(value: Any?, path: String): TaskResult } -fun alwaysFailingParser() = object : Parser() { - override fun ParsingContext.parse(value: Any?, path: String): TaskResult = - Failure(object : Error() { - override val message: String - get() = "Should not be called" - }) -} - fun Parser.parse(context: ParsingContext, value: Any?, path: String) = with(context) { parse(value, path) } @@ -90,40 +82,6 @@ inline fun valueParser() = valueParser { value, path -> value.parseAs(path, T::class).get() } - -class DisjunctionParser( - private val keyToParser: Map> -) : Parser() { - constructor(vararg keyToParser: Pair>) : this(keyToParser.toMap()) - - override fun ParsingContext.parse(value: Any?, path: String): TaskResult = when (value) { - is String -> // consider string value as an empty map - mapOf(value to emptyMap()).asSuccess() - else -> value.parseAs>(path) - }.flatMap { map -> - computeM { - val (singleItem) = map.entries.singleOrNull() - ?.takeIf { it.key is String } - .toResult { ParseError("Setting `$path` should contain a single-key value") } - val (parser) = keyToParser[singleItem.key as String] - .toResult { ParseError("`$path` should be one of [${keyToParser.keys.joinToString()}]") } - parser.parse(this@parse, singleItem.value, path) - } - } -} - -class CollectingParser( - private val keyToParser: Map> -) : Parser>() { - override fun ParsingContext.parse(value: Any?, path: String): TaskResult> = - value.parseAs, List>(this, path) { map -> - map.mapNotNull { (key, value) -> - val parser = keyToParser[key] ?: return@mapNotNull null - parser.parse(this, value, "$path.$key") - }.sequence() - } -} - fun Any?.classMismatchError(path: String, expected: KClass<*>): ParseError { val classpath = this?.let { it::class.simpleName } ?: "null" return ParseError("Expected ${expected.simpleName!!} for `$path` but $classpath was found") diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/SettingValidator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/SettingValidator.kt index 763f5ff0ad2..b765c8268a9 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/SettingValidator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/SettingValidator.kt @@ -23,8 +23,6 @@ fun inValidatorContext(validator: ReadingContext.(V) -> SettingValidator) -typealias StringValidator = SettingValidator - object StringValidators { fun shouldNotBeBlank(name: String) = settingValidator { value: String -> if (value.isBlank()) ValidationResult.ValidationError("${name.capitalize()} should not be blank ") diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt index 870416b2c22..46474db205f 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt @@ -254,8 +254,7 @@ interface ModuleConfigurator : DisplayableSettingItem, EntitiesOwnerDescriptor { .forEach { (id, configurators) -> assert(configurators.size == 1) { id } } } - val BY_ID = ALL.associateBy(ModuleConfigurator::id) - val BY_MODULE_KIND = ALL.groupBy(ModuleConfigurator::moduleKind) + private val BY_ID = ALL.associateBy(ModuleConfigurator::id) fun getParser(moduleIdentificator: Identificator): Parser = valueParserM { value, path -> diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt index 861aacec438..d8572448bbe 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt @@ -119,13 +119,6 @@ class Module( } -val Module.mainSourceset: Sourceset? - get() = sourcesets.firstOrNull { it.sourcesetType == SourcesetType.main } - -val Module.testSourceset: Sourceset? - get() = sourcesets.firstOrNull { it.sourcesetType == SourcesetType.test } - - val Module.path get() = generateSequence(this, Module::parent) .map { it.name }