From bf93d767b39b8ee39a4a723c882a8947e8d9534f Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 15 Jan 2020 12:12:30 +0300 Subject: [PATCH] Wizard: sort & distinct imports in Gradle build files --- .../tools/projectWizard/ir/buildsystem/BuildFileIR.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt index d5068d52782..0c7285c6519 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/BuildFileIR.kt @@ -34,9 +34,14 @@ data class BuildFileIR( if (repositoryIR.repository is DefaultRepository) 0 else 1 } + private fun distinctImportsOrNull(): List? = + irsOfTypeOrNull() + ?.distinctBy(GradleImportIR::import) + ?.sortedBy(GradleImportIR::import) + override fun BuildFilePrinter.render() = when (this) { is GradlePrinter -> { - irsOfTypeOrNull()?.let { imports -> + distinctImportsOrNull()?.let { imports -> imports.listNl() nl() nl()