Formatting of "?:" onto the next line

This commit is contained in:
Valentin Kipyatkov
2016-08-10 11:06:18 +03:00
parent 9890cebfd9
commit 128896fa43
4 changed files with 7 additions and 4 deletions
@@ -256,7 +256,7 @@ object FindTransformationMatcher : TransformationMatcher {
return object : FindOperationGenerator(this) { return object : FindOperationGenerator(this) {
override fun generate(chainedCallGenerator: ChainedCallGenerator): KtExpression { override fun generate(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val generated = this@useElvisOperatorIfNeeded.generate(chainedCallGenerator) val generated = this@useElvisOperatorIfNeeded.generate(chainedCallGenerator)
return KtPsiFactory(generated).createExpressionByPattern("$0 ?: $1", generated, valueIfNotFound) return KtPsiFactory(generated).createExpressionByPattern("$0\n ?: $1", generated, valueIfNotFound)
} }
} }
} }
@@ -3,7 +3,8 @@
fun foo(list: List<String>) { fun foo(list: List<String>) {
val <caret>result = list val <caret>result = list
.firstOrNull { it.length > 0 } .firstOrNull { it.length > 0 }
?.let { bar(it) } ?: "" ?.let { bar(it) }
?: ""
} }
fun bar(s: String): String = s fun bar(s: String): String = s
@@ -3,5 +3,6 @@
fun foo(list: List<String>): Int { fun foo(list: List<String>): Int {
<caret>return list <caret>return list
.firstOrNull { it.isNotEmpty() } .firstOrNull { it.isNotEmpty() }
?.length ?: -1 ?.length
?: -1
} }
@@ -1,5 +1,6 @@
// WITH_RUNTIME // WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'" // INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String { fun foo(list: List<String>): String {
<caret>return list.firstOrNull { it.isNotEmpty() } ?: "" <caret>return list.firstOrNull { it.isNotEmpty() }
?: ""
} }