From 509fcb17c73bcf1a0f0364322a7f39f84ac5bde4 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 24 Sep 2019 12:49:22 +0300 Subject: [PATCH] New J2K: consider empty/singleton children list when comparing trees in default arguments conversion --- .../kotlin/nj2k/conversions/DefaultArgumentsConversion.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt index 31ecb6ddf54..8d579fbbfa9 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt @@ -145,11 +145,11 @@ class DefaultArgumentsConversion(context: NewJ2kConverterContext) : RecursiveApp child1 as JKElement, child2 as JKElement ) - }.reduce(Boolean::and) + }.fold(true, Boolean::and) } else -> false } - }.reduce(Boolean::and) + }.fold(true, Boolean::and) } else false }