Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use compiler arguments before iterating jars to figure out platform kind #2959

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use compiler arguments before iterating jars to figure out platform kind #2959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...rc/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.config.IKotlinFacetSettings
import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
import org.jetbrains.kotlin.idea.base.codeInsight.tooling.tooling
import org.jetbrains.kotlin.idea.base.externalSystem.KotlinGradleFacade
import org.jetbrains.kotlin.idea.base.externalSystem.NodeWithData
import org.jetbrains.kotlin.idea.base.externalSystem.find
import org.jetbrains.kotlin.idea.base.externalSystem.findAll
import org.jetbrains.kotlin.idea.base.platforms.*
Expand All @@ -51,6 +52,7 @@ import org.jetbrains.kotlin.idea.gradleJava.inspections.getResolvedVersionByModu
import org.jetbrains.kotlin.idea.gradleJava.migrateNonJvmSourceFolders
import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION
import org.jetbrains.kotlin.platform.IdePlatformKind
import org.jetbrains.kotlin.platform.idePlatformKind
import org.jetbrains.kotlin.platform.impl.isCommon
import org.jetbrains.kotlin.platform.impl.isJavaScript
import org.jetbrains.kotlin.platform.impl.isJvm
Expand Down Expand Up @@ -254,10 +256,13 @@ fun configureFacetByGradleModule(
return null
}

val platformKind = detectPlatformKindByPlugin(moduleNode) ?: detectPlatformByLibrary(moduleNode)
val kotlinGradleSourceSetDataNode = kotlinGradleProjectDataNode.findAll(KotlinGradleSourceSetData.KEY)
.firstOrNull { it.data.sourceSetName == sourceSetName } ?: return null

val platformKind = detectPlatformKindByPlugin(moduleNode)
?: detectPlatformKindByCompilerArguments(kotlinGradleSourceSetDataNode)
?: detectPlatformByLibrary(moduleNode)

val compilerVersion = kotlinGradleSourceSetDataNode.data?.kotlinPluginVersion?.let(IdeKotlinVersion::opt)
// required for GradleFacetImportTest.{testCommonImportByPlatformPlugin, testKotlinAndroidPluginDetection}
?: KotlinGradleFacade.getInstance()?.findKotlinPluginVersion(moduleNode)
Expand Down Expand Up @@ -311,6 +316,9 @@ fun configureFacetByGradleModule(
return kotlinFacet
}

private fun detectPlatformKindByCompilerArguments(kotlinGradleSourceSetDataNode: NodeWithData<KotlinGradleSourceSetData>?) : IdePlatformKind? =
kotlinGradleSourceSetDataNode?.data?.compilerArguments?.let { IdePlatformKind.platformByCompilerArguments(it) }?.idePlatformKind

private fun IKotlinFacetSettings.configureOutputPaths(moduleNode: DataNode<ModuleData>, platformKind: IdePlatformKind?) {
if (!platformKind.isJavaScript) {
productionOutputPath = null
Expand Down