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

Formatter: fix line break before OperationReference in elvis

Browse Source 
#KT-22362 Fixed
This commit is contained in:
Dmitry Gridin
2019-11-01 15:50:39 +07:00
parent 247619c565
commit d321f4626f
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+1 -1
View File
@@ -615,7 +615,7 @@ abstract class KotlinCommonBlock(
}
if (nodePsi.operationToken == ELVIS && nodePsi.getStrictParentOfType<KtStringTemplateExpression>() == null) {
return { childElement ->
if (childElement.elementType == OPERATION_REFERENCE) {
if (childElement.elementType == OPERATION_REFERENCE && (childElement.psi as? KtOperationReferenceExpression)?.operationSignTokenType == ELVIS) {
Wrap.createWrap(settings.kotlinCustomSettings.WRAP_ELVIS_EXPRESSIONS, true)
} else {
null
idea/testData/formatter/ElvisWithOperationReference.after.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
infix fun String.concat(other: String): String = this
fun binaryContext(anchor: String?) {
val v1 = "1234567890... add many chars ...1234567890" concat "b"
val v2 = anchor
?: "1234567890... add many chars ...1234567890" concat "b"
val v3 = anchor
?: "1234567890... add many chars ...1234567890" concat "1234567890... add many chars ...1234567890" concat "1234567890... add many chars ...1234567890" concat "b"
}
// SET_INT: WRAP_ELVIS_EXPRESSIONS = 2
idea/testData/formatter/ElvisWithOperationReference.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
infix fun String.concat(other: String): String = this
fun binaryContext(anchor: String?) {
val v1 = "1234567890... add many chars ...1234567890" concat "b"
val v2 = anchor ?: "1234567890... add many chars ...1234567890" concat "b"
val v3 = anchor ?: "1234567890... add many chars ...1234567890" concat "1234567890... add many chars ...1234567890" concat "1234567890... add many chars ...1234567890" concat "b"
}
// SET_INT: WRAP_ELVIS_EXPRESSIONS = 2
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
Generated
+5
View File
@@ -245,6 +245,11 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
runTest("idea/testData/formatter/ElvisIndent.after.kt");
}
@TestMetadata("ElvisWithOperationReference.after.kt")
public void testElvisWithOperationReference() throws Exception {
runTest("idea/testData/formatter/ElvisWithOperationReference.after.kt");
}
@TestMetadata("ElvisWrap.after.kt")
public void testElvisWrap() throws Exception {
runTest("idea/testData/formatter/ElvisWrap.after.kt");