From 890da492fb0f253a9fad4555bcb6228b7bffaf37 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 2 Jun 2020 16:10:28 +0300 Subject: [PATCH] [Gradle, JS] Fix grammar in methods for JS import --- .../src/KotlinMPPGradleModelBuilder.kt | 6 +++--- .../jetbrains/kotlin/gradle/plugin/KotlinTarget.kt | 6 +++--- .../kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt | 11 ++++++----- .../kotlin/gradle/plugin/mpp/kotlinTargets.kt | 5 ++--- .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index c1617da516d..f3dc51bc940 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -366,11 +366,11 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { val platformId = (getPlatformType.invoke(gradleTarget) as? Named)?.name ?: return null val platform = KotlinPlatform.byId(platformId) ?: return null val useDisambiguationClassifier = - targetClass.getMethodOrNull("getUseDisambiguitionClassifierAsSourcesetNamePreffix")?.invoke(gradleTarget) as? Boolean ?: true + targetClass.getMethodOrNull("getUseDisambiguationClassifierAsSourceSetNamePrefix")?.invoke(gradleTarget) as? Boolean ?: true val disambiguationClassifier = if (useDisambiguationClassifier) getDisambiguationClassifier(gradleTarget) as? String else { - targetClass.getMethodOrNull("getOverrideDisambiguitionClassifierOnIdeImport")?.invoke(gradleTarget) as? String + targetClass.getMethodOrNull("getOverrideDisambiguationClassifierOnIdeImport")?.invoke(gradleTarget) as? String } val getPreset = targetClass.getMethodOrNull("getPreset") val targetPresetName: String? diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt index 406671b2125..24738cab8fb 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -28,8 +28,8 @@ interface KotlinTargetComponent : SoftwareComponent { interface KotlinTarget : Named, HasAttributes { val targetName: String val disambiguationClassifier: String? get() = targetName - val useDisambiguitionClassifierAsSourcesetNamePreffix: Boolean - val overrideDisambiguitionClassifierOnIdeImport: String? + val useDisambiguationClassifierAsSourceSetNamePrefix: Boolean + val overrideDisambiguationClassifierOnIdeImport: String? val platformType: KotlinPlatformType diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt index 3328ab51d91..6e5d682daf5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt @@ -21,10 +21,11 @@ abstract class KotlinOnlyTargetPreset, T : KotlinCompila protected open fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget): String? = target.targetName - // This function is used in IDE import in order to indicate that sourceSetName=disambiguitionClassifier+compilationName - protected open fun useDisambiguitionClassifierAsSourcesetNamePreffix() = true + // This function is used in IDE import in order to indicate that sourceSetName=disambiguationClassifier+compilationName + protected open fun useDisambiguationClassifierAsSourceSetNamePrefix() = true - protected open fun overrideDisambiguitionClassifierOnIdeImport(name: String): String? = null + // This function is used in IDE import in order to override sourceSetName + protected open fun overrideDisambiguationClassifierOnIdeImport(name: String): String? = null abstract protected fun instantiateTarget(name: String): R @@ -32,8 +33,8 @@ abstract class KotlinOnlyTargetPreset, T : KotlinCompila val result = instantiateTarget(name).apply { targetName = name disambiguationClassifier = provideTargetDisambiguationClassifier(this@apply) - useDisambiguitionClassifierAsSourcesetNamePreffix = useDisambiguitionClassifierAsSourcesetNamePreffix() - overrideDisambiguitionClassifierOnIdeImport = overrideDisambiguitionClassifierOnIdeImport(name) + useDisambiguationClassifierAsSourceSetNamePrefix = useDisambiguationClassifierAsSourceSetNamePrefix() + overrideDisambiguationClassifierOnIdeImport = overrideDisambiguationClassifierOnIdeImport(name) preset = this@KotlinOnlyTargetPreset val compilationFactory = createCompilationFactory(this) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt index 20477eca30b..1eeea339e4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt @@ -13,7 +13,6 @@ import org.gradle.api.artifacts.ConfigurablePublishArtifact import org.gradle.api.artifacts.PublishArtifact import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.AttributeContainer -import org.gradle.api.attributes.Usage import org.gradle.api.attributes.Usage.JAVA_RUNTIME_JARS import org.gradle.api.component.ComponentWithCoordinates import org.gradle.api.component.ComponentWithVariants @@ -43,10 +42,10 @@ abstract class AbstractKotlinTarget( override val defaultConfigurationName: String get() = disambiguateName("default") - override var useDisambiguitionClassifierAsSourcesetNamePreffix: Boolean = true + override var useDisambiguationClassifierAsSourceSetNamePrefix: Boolean = true internal set - override var overrideDisambiguitionClassifierOnIdeImport: String? = null + override var overrideDisambiguationClassifierOnIdeImport: String? = null internal set override val apiElementsConfigurationName: String diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt index e94de1145e4..e71c6cc1c80 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt @@ -31,15 +31,12 @@ open class KotlinJsTargetPreset( override val platformType: KotlinPlatformType get() = KotlinPlatformType.js - override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = irPreset == null + override fun useDisambiguationClassifierAsSourceSetNamePrefix() = irPreset == null - override fun overrideDisambiguitionClassifierOnIdeImport(name: String): String? = if (isMpp) { + override fun overrideDisambiguationClassifierOnIdeImport(name: String): String? = irPreset?.let { name.removeJsCompilerSuffix(KotlinJsCompilerType.LEGACY) } - } else { - null - } override fun instantiateTarget(name: String): KotlinJsTarget { return project.objects.newInstance( @@ -105,6 +102,9 @@ class KotlinJsSingleTargetPreset( override val isMpp: Boolean get() = false + override fun overrideDisambiguationClassifierOnIdeImport(name: String): String? = + null + // In a Kotlin/JS single-platform project, we don't need any disambiguation suffixes or prefixes in the names: override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget): String? = irPreset?.let {