From 4a0f14b64b05693029d68c6eec9702fdcf6eb15a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 29 Aug 2016 18:12:32 +0300 Subject: [PATCH] Minor: toString() for NONE filter --- .../org/jetbrains/kotlin/resolve/StatementFilter.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt index b0b669b0628..a1ce24f6fb3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt @@ -17,23 +17,23 @@ package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.psi.KtBlockExpression -import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtPsiUtil open class StatementFilter { - open val filter: ((KtExpression) -> Boolean)? get() = null companion object { - @JvmField val NONE: StatementFilter = StatementFilter() + @JvmField val NONE = object : StatementFilter() { + override fun toString() = "NONE" + } } } fun StatementFilter.filterStatements(block: KtBlockExpression): List { - if (filter == null || block is KtPsiUtil.KtExpressionWrapper) return block.getStatements() - return block.getStatements().filter { filter!!(it) } + if (filter == null || block is KtPsiUtil.KtExpressionWrapper) return block.statements + return block.statements.filter { filter!!(it) } } fun StatementFilter.getLastStatementInABlock(block: KtBlockExpression) = filterStatements(block).lastOrNull() \ No newline at end of file