From 379afa187baf23c4928819dc6b4fbb3abf9f6f59 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Fri, 11 Nov 2016 16:42:32 +0300 Subject: [PATCH] IDL2K: consider attribute ignores (from config.kt) before merge --- libraries/tools/idl2k/src/main/kotlin/render.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/tools/idl2k/src/main/kotlin/render.kt b/libraries/tools/idl2k/src/main/kotlin/render.kt index 1be3358d970..7a06f674ccc 100644 --- a/libraries/tools/idl2k/src/main/kotlin/render.kt +++ b/libraries/tools/idl2k/src/main/kotlin/render.kt @@ -174,6 +174,8 @@ fun Appendable.render(allTypes: Map, typeNamesToUn .filter { it !in superAttributes && !it.static && (it.isVar || (it.isVal && superAttributesByName[it.name]?.hasNoVars() ?: true)) } .map { it.dynamicIfUnknownType(allTypes.keys) } .groupBy { it.name } + .mapValues { it.value.filter { "${iface.name}.${it.name}" !in commentOutDeclarations && "${iface.name}.${it.name}: ${it.type.render()}" !in commentOutDeclarations } } + .filterValues { it.isNotEmpty() } .reduceValues(::merge).values.forEach { attribute -> val modality = when { attribute.signature in superSignatures -> MemberModality.OVERRIDE