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

Formatter: fix continuation indent in call chain

Browse Source 
#KT-37545 Fixed
This commit is contained in:
Dmitry Gridin
2020-03-18 12:37:28 +00:00
parent 2c06503311
commit 7a3f6f5312
4 changed files with 380 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+25 -14
View File
@@ -131,13 +131,16 @@ abstract class KotlinCommonBlock(
val block = nodeSubBlocks.first()
val wrap = createWrapForQualifierExpression(node)
val indent = createIndentForQualifierExpression(node)
val newBlock = block.processBlock(indent, wrap)
val enforceIndentToChildren = anyCallInCallChainIsWrapped(node)
val indent = createIndentForQualifierExpression(enforceIndentToChildren)
val newBlock = block.processBlock(wrap, enforceIndentToChildren)
return nodeSubBlocks.replaceBlock(newBlock, 0).splitAtIndex(operationBlockIndex, indent, wrap)
}
private fun ASTBlock.processBlock(indent: Indent, wrap: Wrap?): ASTBlock {
private fun ASTBlock.processBlock(wrap: Wrap?, enforceIndentToChildren: Boolean): ASTBlock {
val currentNode = requireNode()
val enforceIndent = enforceIndentToChildren && anyCallInCallChainIsWrapped(currentNode)
val indent = createIndentForQualifierExpression(enforceIndent)
@Suppress("UNCHECKED_CAST")
val subBlocks = subBlocks as List<ASTBlock>
@@ -150,8 +153,7 @@ abstract class KotlinCommonBlock(
else
null
val newBlock = subBlocks.elementAt(index).processBlock(indent, resultWrap)
val newBlock = subBlocks.elementAt(index).processBlock(resultWrap, enforceIndent)
return subBlocks.replaceBlock(newBlock, index).let {
val operationIndex = subBlocks.indexOfBlockWithType(QUALIFIED_OPERATION)
if (operationIndex != -1)
@@ -178,11 +180,9 @@ abstract class KotlinCommonBlock(
else
null
private fun createIndentForQualifierExpression(node: ASTNode): Indent {
// enforce indent to children when there's a line break before the dot in any call in the chain (meaning that
// the call chain following that call is indented)
val enforceIndentToChildren = anyCallInCallChainIsWrapped(node)
// enforce indent to children when there's a line break before the dot in any call in the chain (meaning that
// the call chain following that call is indented)
private fun createIndentForQualifierExpression(enforceIndentToChildren: Boolean): Indent {
val indentType = if (settings.kotlinCustomSettings.CONTINUATION_INDENT_FOR_CHAINED_CALLS) {
if (enforceIndentToChildren) Indent.Type.CONTINUATION else Indent.Type.CONTINUATION_WITHOUT_FIRST
} else {
@@ -825,11 +825,22 @@ private val ASTNode.isCall: Boolean
get() = unwrapQualifier()?.lastChildNode?.elementType == CALL_EXPRESSION
private fun anyCallInCallChainIsWrapped(node: ASTNode): Boolean {
val sequentialCalls = generateSequence(node) { it.firstChildNode }.takeWhile { it.isCall }
val sequentialNodes = generateSequence(node) {
when (it.elementType) {
POSTFIX_EXPRESSION, in QUALIFIED_EXPRESSIONS -> it.firstChildNode
PARENTHESIZED -> getSiblingWithoutWhitespaceAndComments(it.firstChildNode, true)
else -> null
}
}
return sequentialCalls.any { call ->
val qualifier = call.findChildByType(QUALIFIED_OPERATION)
qualifier != null && hasLineBreakBefore(qualifier)
return sequentialNodes.any {
val checkedElement = when (it.elementType) {
in QUALIFIED_EXPRESSIONS -> it.findChildByType(QUALIFIED_OPERATION)
PARENTHESIZED -> it.lastChildNode
else -> null
}
checkedElement != null && hasLineBreakBefore(checkedElement)
}
}
idea/testData/formatter/callChain/KT37545.after.kt
Vendored
+175
View File
@@ -0,0 +1,175 @@
import X.combine
class IndentationIssue {
fun method() {
X.Y.combine(
1,
1
)
.let {
"zzz"
}
X.Y.combine(
1,
1
).let {
"zzz"
}
X.Y./*
comment
*/combine(
1,
1
)
.let {
"zzz"
}
X.Y./*
comment
*/combine(
1,
1
).let {
"zzz"
}
(X.Y.combine(
1,
1
)
).let {
"zzz"
}
X.Y
.combine(
1,
1
)
.let { "zzz" }
X.Y
.combine(
1,
1
).let {
"zzz"
}
X
.Y
.combine(
1,
1
)
.let { "zzz" }
X
.Y.combine(
1,
1
)
.let { "zzz" }
combine(
1,
1
)
.let { "zzz" }
combine(
1,
2
).let {
"zzz"
}.let {
"zzz"
}
(combine(
1,
2
).let {
"zzz"
}).let {
"zzz"
}
(combine(
1,
2
)
.let {
"zzz"
}).let {
"zzz"
}
combine(
1,
2
).let {
"zzz"
}!!.let {
"zzz"
}
combine(
1,
2
)
.let {
"zzz"
}!!.let {
"zzz"
}
(combine(
1,
2
)
.let {
"zzz"
})!!.let {
"zzz"
}
((combine(
1,
2
)
).let {
"zzz"
}!!)!!.let {
"zzz"
}
((combine(
1,
2
)).let {
"zzz"
}!!)!!.let {
"zzz"
}
((combine(
1,
2
)).let {
"zzz"
}!!
)!!.let {
"zzz"
}
}
}
object X {
fun <L, R, T> combine(x: L, y: R): T = TODO()
val Y get() = this
}
idea/testData/formatter/callChain/KT37545.kt
Vendored
+175
View File
@@ -0,0 +1,175 @@
import X.combine
class IndentationIssue {
fun method() {
X.Y.combine(
1,
1
)
.let {
"zzz"
}
X.Y.combine(
1,
1
).let {
"zzz"
}
X.Y./*
comment
*/combine(
1,
1
)
.let {
"zzz"
}
X.Y./*
comment
*/combine(
1,
1
).let {
"zzz"
}
(X.Y.combine(
1,
1
)
).let {
"zzz"
}
X.Y
.combine(
1,
1
)
.let { "zzz" }
X.Y
.combine(
1,
1
).let {
"zzz"
}
X
.Y
.combine(
1,
1
)
.let { "zzz" }
X
.Y.combine(
1,
1
)
.let { "zzz" }
combine(
1,
1
)
.let { "zzz" }
combine(
1,
2
).let {
"zzz"
}.let {
"zzz"
}
(combine(
1,
2
).let {
"zzz"
}).let {
"zzz"
}
(combine(
1,
2
)
.let {
"zzz"
}).let {
"zzz"
}
combine(
1,
2
).let {
"zzz"
}!!.let {
"zzz"
}
combine(
1,
2
)
.let {
"zzz"
}!!.let {
"zzz"
}
(combine(
1,
2
)
.let {
"zzz"
})!!.let {
"zzz"
}
((combine(
1,
2
)
).let {
"zzz"
}!!)!!.let {
"zzz"
}
((combine(
1,
2
)).let {
"zzz"
}!!)!!.let {
"zzz"
}
((combine(
1,
2
)).let {
"zzz"
}!!
)!!.let {
"zzz"
}
}
}
object X {
fun <L, R, T> combine(x: L, y: R): T = TODO()
val Y get() = this
}
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
Generated
+5
View File
@@ -937,6 +937,11 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
runTest("idea/testData/formatter/callChain/KT36466.after.kt");
}
@TestMetadata("KT37545.after.kt")
public void testKT37545() throws Exception {
runTest("idea/testData/formatter/callChain/KT37545.after.kt");
}
@TestMetadata("NotCallChain.after.kt")
public void testNotCallChain() throws Exception {
runTest("idea/testData/formatter/callChain/NotCallChain.after.kt");