From f701cdcc97b8637dd9b6a702a65e25dd6578b114 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Tue, 16 Mar 2021 13:01:16 +0100 Subject: [PATCH] [CHERRY PICKED FROM IJ] Trigger face change event to address facet change save GitOrigin-RevId: 952c9e6f3270f75d6a293e71d33f958e24ff3c2a Original commit: https://github.com/JetBrains/intellij-community/commit/18c931145f22fd69826e480bfe596e75ec05bab0 --- .../src/org/jetbrains/kotlin/config/facetSerialization.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 7412c7a016f..9c1b72ea49d 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -107,8 +107,7 @@ private fun readV1Config(element: Element): KotlinFacetSettings { // TODO: Introduce new version of facet serialization. See https://youtrack.jetbrains.com/issue/KT-38235 // This is necessary to avoid having too much custom logic for platform serialization. fun Element.getFacetPlatformByConfigurationElement(): TargetPlatform { - val targetPlatform = getAttributeValue("allPlatforms").deserializeTargetPlatformByComponentPlatforms() - if (targetPlatform != null) return targetPlatform + getAttributeValue("allPlatforms").deserializeTargetPlatformByComponentPlatforms()?.let { return it } // failed to read list of all platforms. Fallback to legacy algorithm val platformName = getAttributeValue("platform") ?: return DefaultIdeTargetPlatformKindProvider.defaultPlatform @@ -422,9 +421,7 @@ private fun TargetPlatform.serializeComponentPlatforms(): String { } private fun String?.deserializeTargetPlatformByComponentPlatforms(): TargetPlatform? { - val componentPlatformNames = this?.split('/')?.toSet() - if (componentPlatformNames == null || componentPlatformNames.isEmpty()) - return null + val componentPlatformNames = this?.split('/')?.toSet()?.takeIf { it.isNotEmpty() } ?: return null val knownComponentPlatforms = HashMap() // "serialization presentation" to "simple platform name"