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

TrailingCommaPostFormatProcessor: convert mapNotNull to filter

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2020-01-23 17:58:03 +07:00
parent a2b2c47b51
commit 522ae4945e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/formatter/TrailingCommaPostFormatProcessor.kt
+3 -6
View File
@@ -42,12 +42,9 @@ class TrailingCommaPostFormatProcessor : PostFormatProcessor {
companion object { companion object {
fun findInvalidCommas(commaOwner: KtElement): List<PsiElement> = commaOwner.firstChild fun findInvalidCommas(commaOwner: KtElement): List<PsiElement> = commaOwner.firstChild
?.siblings(withItself = false) ?.siblings(withItself = false)
?.mapNotNull { element -> ?.filter { it.isComma }
if (!element.isComma) return@mapNotNull null ?.filter {
element.takeIf { it.prevLeaf(true)?.isLineBreak() == true || it.leafIgnoringWhitespace(false) != it.leafIgnoringWhitespaceAndComments(false)
it.prevLeaf(true)?.isLineBreak() == true ||
it.leafIgnoringWhitespace(false) != it.leafIgnoringWhitespaceAndComments(false)
}
}?.toList().orEmpty() }?.toList().orEmpty()
fun needComma( fun needComma(