From 92713bdcb3cdc608dc34a0b874f5d382b33c4f1c Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 14 Jun 2022 13:17:56 +0200 Subject: [PATCH] [kpm] IdeaKpmContentRoot: Rename SOURCE_TYPE -> SOURCES_TYPE & RESOURCE_TYPE -> RESOURCES_TYPE ^KT-52568 Verification Pending --- .../kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt | 12 ++++++++++-- .../kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt index 809fe4093da..7cfced47f47 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt @@ -3,8 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ +@file:Suppress("unused") + package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot.Companion.RESOURCES_TYPE +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot.Companion.SOURCES_TYPE import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.emptyExtras import java.io.File @@ -16,11 +20,15 @@ sealed interface IdeaKpmContentRoot : Serializable { val type: String companion object { - const val SOURCE_TYPE = "source" - const val RESOURCE_TYPE = "resource" + const val SOURCES_TYPE = "source" + const val RESOURCES_TYPE = "resource" } } +val IdeaKpmContentRoot.isSources get() = type == SOURCES_TYPE + +val IdeaKpmContentRoot.isResources get() = type == RESOURCES_TYPE + @InternalKotlinGradlePluginApi data class IdeaKpmContentRootImpl( override val file: File, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt index e3932a3e519..238d3103564 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt @@ -19,7 +19,7 @@ private fun IdeaKpmProjectBuildingContext.buildIdeaKpmFragment(fragment: GradleK languageSettings = IdeaKpmLanguageSettings(fragment.languageSettings), dependencies = dependencyResolver.resolve(fragment).toList(), contentRoots = fragment.kotlinSourceRoots.sourceDirectories.files.map { file -> - IdeaKpmContentRootImpl(file, type = IdeaKpmContentRoot.SOURCE_TYPE) + IdeaKpmContentRootImpl(file, type = IdeaKpmContentRoot.SOURCES_TYPE) }, extras = fragment.extras )