azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: toString() for NONE filter

Browse Source
This commit is contained in:
Nikolay Krasko
2016-08-29 18:12:32 +03:00
parent 52dd02fe08
commit 4a0f14b64b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt
+5 -5
View File
@@ -17,23 +17,23 @@
package org.jetbrains.kotlin.resolve package org.jetbrains.kotlin.resolve
import org.jetbrains.kotlin.psi.KtBlockExpression import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtPsiUtil import org.jetbrains.kotlin.psi.KtPsiUtil
open class StatementFilter { open class StatementFilter {
open val filter: ((KtExpression) -> Boolean)? open val filter: ((KtExpression) -> Boolean)?
get() = null get() = null
companion object { companion object {
@JvmField val NONE: StatementFilter = StatementFilter() @JvmField val NONE = object : StatementFilter() {
override fun toString() = "NONE"
}
} }
} }
fun StatementFilter.filterStatements(block: KtBlockExpression): List<KtExpression> { fun StatementFilter.filterStatements(block: KtBlockExpression): List<KtExpression> {
if (filter == null || block is KtPsiUtil.KtExpressionWrapper) return block.getStatements() if (filter == null || block is KtPsiUtil.KtExpressionWrapper) return block.statements
return block.getStatements().filter { filter!!(it) } return block.statements.filter { filter!!(it) }
} }
fun StatementFilter.getLastStatementInABlock(block: KtBlockExpression) = filterStatements(block).lastOrNull() fun StatementFilter.getLastStatementInABlock(block: KtBlockExpression) = filterStatements(block).lastOrNull()