From ae7cc8a1338d5308aae5db2987b51269d2353a11 Mon Sep 17 00:00:00 2001 From: Corey Date: Thu, 29 Nov 2018 11:22:21 -0500 Subject: [PATCH] Consider non-existent `AttributeContainer`s empty Given the prior faulty logic, no tree of `HierarchyAttributeContainer`s would ever report itself as empty (not even a 'tree' consisting of a single, attribute-less/empty HierarchyAttributeContainer), since every tree will have a root, which will lack a parent, and it considered the lack of existence of a parent to mean that that root container is not empty. --- .../kotlin/gradle/plugin/mpp/HierarchyAttributeContainer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/HierarchyAttributeContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/HierarchyAttributeContainer.kt index 2eda20c3d72..1c6c4f96fda 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/HierarchyAttributeContainer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/HierarchyAttributeContainer.kt @@ -30,7 +30,7 @@ class HierarchyAttributeContainer(val parent: AttributeContainer?) : AttributeCo override fun getAttribute(key: Attribute?): T? = attributesMap.get(key as Attribute<*>) as T? ?: parent?.getAttribute(key) - override fun isEmpty(): Boolean = attributesMap.isEmpty() && parent?.isEmpty ?: false + override fun isEmpty(): Boolean = attributesMap.isEmpty() && (parent?.isEmpty ?: true) override fun keySet(): Set> = attributesMap.keys + parent?.keySet().orEmpty() @@ -41,4 +41,4 @@ class HierarchyAttributeContainer(val parent: AttributeContainer?) : AttributeCo } override fun getAttributes(): AttributeContainer = this -} \ No newline at end of file +}