From 85998f88578a104b94881674d5017a2e4c0d5edb Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Wed, 16 Mar 2022 10:55:27 +0100 Subject: [PATCH] [KPM] Consistently use uppercase factory style for idea model builders KT-51386 --- .../idea/IdeaKotlinCompilationOutputBuilder.kt | 6 +++--- .../kpm/idea/IdeaKotlinFragmentBuilder.kt | 8 ++++---- .../idea/IdeaKotlinLanguageSettingsBuilder.kt | 18 +++++++++--------- .../kpm/idea/IdeaKotlinPlatformBuilder.kt | 2 +- .../kpm/idea/IdeaKotlinProjectModelBuilder.kt | 2 +- .../idea/IdeaKotlinProjectModelBuilderImpl.kt | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinCompilationOutputBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinCompilationOutputBuilder.kt index 4968b17e239..0a5afbf6458 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinCompilationOutputBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinCompilationOutputBuilder.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput -internal fun KotlinCompilationOutput.toIdeaKotlinCompilationOutputs(): IdeaKotlinCompilationOutput { +internal fun IdeaKotlinCompilationOutput(compilation: KotlinCompilationOutput): IdeaKotlinCompilationOutput { return IdeaKotlinCompilationOutputImpl( - classesDirs = this.classesDirs.toSet(), - resourcesDir = this.resourcesDir + classesDirs = compilation.classesDirs.toSet(), + resourcesDir = compilation.resourcesDir ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragmentBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragmentBuilder.kt index d2d4b851fff..351771dc38d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragmentBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinFragmentBuilder.kt @@ -16,8 +16,8 @@ internal fun IdeaKotlinProjectModelBuildingContext.IdeaKotlinFragment(fragment: private fun IdeaKotlinProjectModelBuildingContext.buildIdeaKotlinFragment(fragment: KotlinGradleFragment): IdeaKotlinFragment { return IdeaKotlinFragmentImpl( coordinates = IdeaKotlinFragmentCoordinates(fragment), - platforms = fragment.containingVariants.map { variant -> buildIdeaKotlinPlatform(variant) }.toSet(), - languageSettings = fragment.languageSettings.toIdeaKotlinLanguageSettings(), + platforms = fragment.containingVariants.map { variant -> IdeaKotlinPlatform(variant) }.toSet(), + languageSettings = IdeaKotlinLanguageSettings(fragment.languageSettings), dependencies = dependencyResolver.resolve(fragment).toList(), sourceDirectories = fragment.kotlinSourceRoots.sourceDirectories.files.toList().map { file -> IdeaKotlinSourceDirectoryImpl(file) }, resourceDirectories = emptyList(), @@ -28,8 +28,8 @@ private fun IdeaKotlinProjectModelBuildingContext.buildIdeaKotlinFragment(fragme private fun IdeaKotlinProjectModelBuildingContext.buildIdeaKotlinVariant(variant: KotlinGradleVariant): IdeaKotlinVariant { return IdeaKotlinVariantImpl( fragment = buildIdeaKotlinFragment(variant), - platform = buildIdeaKotlinPlatform(variant), + platform = IdeaKotlinPlatform(variant), variantAttributes = variant.variantAttributes.mapKeys { (key, _) -> key.uniqueName }, - compilationOutputs = variant.compilationOutputs.toIdeaKotlinCompilationOutputs() + compilationOutputs = IdeaKotlinCompilationOutput(variant.compilationOutputs) ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettingsBuilder.kt index e0447c825b5..f3eef6a9d4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinLanguageSettingsBuilder.kt @@ -8,15 +8,15 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder import org.jetbrains.kotlin.project.model.LanguageSettings -internal fun LanguageSettings.toIdeaKotlinLanguageSettings(): IdeaKotlinLanguageSettings { +internal fun IdeaKotlinLanguageSettings(languageSettings: LanguageSettings): IdeaKotlinLanguageSettings { return IdeaKotlinLanguageSettingsImpl( - languageVersion = languageVersion, - apiVersion = apiVersion, - isProgressiveMode = progressiveMode, - enabledLanguageFeatures = enabledLanguageFeatures.toSet(), - optInAnnotationsInUse = optInAnnotationsInUse.toSet(), - compilerPluginArguments = (this as? DefaultLanguageSettingsBuilder)?.compilerPluginArguments?.toList().orEmpty(), - compilerPluginClasspath = (this as? DefaultLanguageSettingsBuilder)?.compilerPluginClasspath?.toList().orEmpty(), - freeCompilerArgs = (this as? DefaultLanguageSettingsBuilder)?.freeCompilerArgs?.toList().orEmpty() + languageVersion = languageSettings.languageVersion, + apiVersion = languageSettings.apiVersion, + isProgressiveMode = languageSettings.progressiveMode, + enabledLanguageFeatures = languageSettings.enabledLanguageFeatures.toSet(), + optInAnnotationsInUse = languageSettings.optInAnnotationsInUse.toSet(), + compilerPluginArguments = (languageSettings as? DefaultLanguageSettingsBuilder)?.compilerPluginArguments?.toList().orEmpty(), + compilerPluginClasspath = (languageSettings as? DefaultLanguageSettingsBuilder)?.compilerPluginClasspath?.toList().orEmpty(), + freeCompilerArgs = (languageSettings as? DefaultLanguageSettingsBuilder)?.freeCompilerArgs?.toList().orEmpty() ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinPlatformBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinPlatformBuilder.kt index c55e74fed08..d8192bd992c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinPlatformBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinPlatformBuilder.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.konan.target.HostManager @Suppress("unused") /* Receiver acts as scope, or key to that function */ -internal fun IdeaKotlinProjectModelBuildingContext.buildIdeaKotlinPlatform(variant: KotlinGradleVariant): IdeaKotlinPlatform { +internal fun IdeaKotlinProjectModelBuildingContext.IdeaKotlinPlatform(variant: KotlinGradleVariant): IdeaKotlinPlatform { when (variant) { is KotlinJvmVariant -> return IdeaKotlinPlatform.jvm(variant.compilationData.kotlinOptions.jvmTarget ?: JvmTarget.DEFAULT.name) is KotlinNativeVariantInternal -> return IdeaKotlinPlatform.native(variant.konanTarget.name) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt index 8cb1f2043e7..94acde6888b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilder.kt @@ -129,7 +129,7 @@ interface IdeaKotlinProjectModelBuilder { companion object } -internal fun IdeaKotlinProjectModelBuildingContext.toIdeaKotlinProjectModel(extension: KotlinPm20ProjectExtension): IdeaKotlinProjectModel { +internal fun IdeaKotlinProjectModelBuildingContext.IdeaKotlinProjectModel(extension: KotlinPm20ProjectExtension): IdeaKotlinProjectModel { return IdeaKotlinProjectModelImpl( gradlePluginVersion = extension.project.getKotlinPluginVersion(), coreLibrariesVersion = extension.coreLibrariesVersion, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilderImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilderImpl.kt index 4ef94cae816..911e11ae118 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilderImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelBuilderImpl.kt @@ -71,7 +71,7 @@ internal class IdeaKotlinProjectModelBuilderImpl @UnsafeApi("Use factory methods } override fun buildIdeaKotlinProjectModel(): IdeaKotlinProjectModel { - return Context().toIdeaKotlinProjectModel(extension) + return Context().IdeaKotlinProjectModel(extension) } override fun canBuild(modelName: String): Boolean =