MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[IJPL-174685] Do not continue processing if kotlin data node is null

Browse Source 
the search for the dataNode uses a name comparison, and for the case of Android for example, the names won't match and we will end up finding nothing.
The function should not continue processing data if the dataNode is null because it will just use fallbacks instead of configuring the right way.
For the NAdroid case, we even have our own data service that actually passes the right name in this case.

closes https://github.com/JetBrains/intellij-community/pull/2898

GitOrigin-RevId: 96428ded562d3ff92e2de915e5afc4ae92384cd7
This commit is contained in:
Karima Ichou
2025-02-11 19:40:47 +00:00
committed by intellij-monorepo-bot
parent 617b47e26e
commit 08e60ab334
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt
+2 -2
View File
@@ -256,9 +256,9 @@ fun configureFacetByGradleModule(
val platformKind = detectPlatformKindByPlugin(moduleNode) ?: detectPlatformByLibrary(moduleNode)
val kotlinGradleSourceSetDataNode = kotlinGradleProjectDataNode.findAll(KotlinGradleSourceSetData.KEY)
.firstOrNull { it.data.sourceSetName == sourceSetName }
.firstOrNull { it.data.sourceSetName == sourceSetName } ?: return null
val compilerVersion = kotlinGradleSourceSetDataNode?.data?.kotlinPluginVersion?.let(IdeKotlinVersion::opt)
val compilerVersion = kotlinGradleSourceSetDataNode.data?.kotlinPluginVersion?.let(IdeKotlinVersion::opt)
// required for GradleFacetImportTest.{testCommonImportByPlatformPlugin, testKotlinAndroidPluginDetection}
?: KotlinGradleFacade.getInstance()?.findKotlinPluginVersion(moduleNode)