Formatter: fix some cases of call chain with wrap first call chain
#KT-35388 Fixed
This commit is contained in:
@@ -122,7 +122,9 @@ abstract class KotlinCommonBlock(
|
|||||||
return nodeSubBlocks
|
return nodeSubBlocks
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun ASTNode.isQualifiedNode(): Boolean {
|
private fun ASTNode.isQualifiedNode(strict: Boolean = false): Boolean {
|
||||||
|
if (strict) return elementType in QUALIFIED_EXPRESSIONS
|
||||||
|
|
||||||
var currentNode: ASTNode? = this
|
var currentNode: ASTNode? = this
|
||||||
while (currentNode != null) {
|
while (currentNode != null) {
|
||||||
if (currentNode.elementType in QUALIFIED_EXPRESSIONS) return true
|
if (currentNode.elementType in QUALIFIED_EXPRESSIONS) return true
|
||||||
@@ -143,7 +145,7 @@ abstract class KotlinCommonBlock(
|
|||||||
if (operationBlockIndex == -1) return nodeSubBlocks
|
if (operationBlockIndex == -1) return nodeSubBlocks
|
||||||
|
|
||||||
val block = nodeSubBlocks.first()
|
val block = nodeSubBlocks.first()
|
||||||
val wrap = createWrapForQualifiedExpression(block.requireNode())
|
val wrap = createWrapForQualifiedExpression(node)
|
||||||
val indent = createIndentForQualifiedExpression(block)
|
val indent = createIndentForQualifiedExpression(block)
|
||||||
val newBlock = block.processBlock(indent, wrap)
|
val newBlock = block.processBlock(indent, wrap)
|
||||||
return nodeSubBlocks.replaceBlock(newBlock, 0).splitAtIndex(operationBlockIndex, indent, wrap)
|
return nodeSubBlocks.replaceBlock(newBlock, 0).splitAtIndex(operationBlockIndex, indent, wrap)
|
||||||
@@ -164,7 +166,11 @@ abstract class KotlinCommonBlock(
|
|||||||
else -> return this
|
else -> return this
|
||||||
}
|
}
|
||||||
|
|
||||||
val resultWrap = wrap.takeIf { elementType != PARENTHESIZED } ?: createWrapForQualifiedExpression(currentNode)
|
val resultWrap = if (currentNode.wrapForFirstCallInChainIsAllowed)
|
||||||
|
wrap.takeIf { elementType != PARENTHESIZED } ?: createWrapForQualifiedExpression(currentNode)
|
||||||
|
else
|
||||||
|
null
|
||||||
|
|
||||||
val newBlock = subBlocks.elementAt(index).processBlock(indent, resultWrap)
|
val newBlock = subBlocks.elementAt(index).processBlock(indent, resultWrap)
|
||||||
return subBlocks.replaceBlock(newBlock, index).let {
|
return subBlocks.replaceBlock(newBlock, index).let {
|
||||||
val operationIndex = subBlocks.indexOfBlockWithType(QUALIFIED_OPERATION)
|
val operationIndex = subBlocks.indexOfBlockWithType(QUALIFIED_OPERATION)
|
||||||
@@ -175,22 +181,20 @@ abstract class KotlinCommonBlock(
|
|||||||
}.wrapToBlock(currentNode, this)
|
}.wrapToBlock(currentNode, this)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun List<ASTBlock>.replaceBlock(
|
private fun List<ASTBlock>.replaceBlock(block: ASTBlock, index: Int = 0): List<ASTBlock> = toMutableList().apply { this[index] = block }
|
||||||
block: ASTBlock,
|
|
||||||
index: Int = 0
|
|
||||||
): List<ASTBlock> = subList(0, index) + block + (takeIf { index + 1 < it.size }?.subList(index + 1, size) ?: emptyList())
|
|
||||||
|
|
||||||
private fun createWrapForQualifiedExpression(node: ASTNode): Wrap? {
|
private val ASTNode.wrapForFirstCallInChainIsAllowed
|
||||||
val isNonFirstChainedCall = (node.treeParent)?.isQualifiedNode() == true
|
get() = settings.kotlinCommonSettings.WRAP_FIRST_METHOD_IN_CALL_CHAIN ||
|
||||||
|
settings.kotlinCommonSettings.METHOD_CALL_CHAIN_WRAP != CommonCodeStyleSettings.WRAP_AS_NEEDED ||
|
||||||
|
firstChildNode?.isQualifiedNode(true) == true
|
||||||
|
|
||||||
return if (isNonFirstChainedCall)
|
private fun createWrapForQualifiedExpression(node: ASTNode): Wrap? = if (node.wrapForFirstCallInChainIsAllowed)
|
||||||
Wrap.createWrap(
|
Wrap.createWrap(
|
||||||
settings.kotlinCommonSettings.METHOD_CALL_CHAIN_WRAP,
|
settings.kotlinCommonSettings.METHOD_CALL_CHAIN_WRAP,
|
||||||
settings.kotlinCommonSettings.WRAP_FIRST_METHOD_IN_CALL_CHAIN
|
settings.kotlinCommonSettings.WRAP_FIRST_METHOD_IN_CALL_CHAIN
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
null
|
null
|
||||||
}
|
|
||||||
|
|
||||||
private fun createIndentForQualifiedExpression(block: ASTBlock): Indent {
|
private fun createIndentForQualifiedExpression(block: ASTBlock): Indent {
|
||||||
// enforce indent to children when there's a line break before the dot in any call in the chain (meaning that
|
// enforce indent to children when there's a line break before the dot in any call in the chain (meaning that
|
||||||
|
|||||||
@@ -3,6 +3,44 @@ val x = foo
|
|||||||
.baz()
|
.baz()
|
||||||
.quux()
|
.quux()
|
||||||
|
|
||||||
|
val x2 = foo()
|
||||||
|
.bar()
|
||||||
|
.baz()
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x3 = ((foo()
|
||||||
|
.bar()))
|
||||||
|
.baz()
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x4 = (foo()
|
||||||
|
.bar()
|
||||||
|
.baz())
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x5 = (foo())
|
||||||
|
.bar()
|
||||||
|
.baz()
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x6 = foo!!
|
||||||
|
.bar()
|
||||||
|
.baz()!!
|
||||||
|
.quux()!!
|
||||||
|
|
||||||
|
val x7 = foo!!
|
||||||
|
.bar()
|
||||||
|
.baz()!!
|
||||||
|
.quux()!!
|
||||||
|
|
||||||
|
val x8 = foo!!!!!!!!
|
||||||
|
.bar()
|
||||||
|
.baz()!!
|
||||||
|
.quux()!!
|
||||||
|
|
||||||
|
val x9 = ((b!!)!!!!)!!
|
||||||
|
.f
|
||||||
|
|
||||||
val y = xyzzy(foo
|
val y = xyzzy(foo
|
||||||
.bar()
|
.bar()
|
||||||
.baz()
|
.baz()
|
||||||
|
|||||||
@@ -2,6 +2,34 @@ val x = foo.bar()
|
|||||||
.baz()
|
.baz()
|
||||||
.quux()
|
.quux()
|
||||||
|
|
||||||
|
val x2 = foo().bar()
|
||||||
|
.baz()
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x3 = ((foo().bar())).baz()
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x4 = (foo().bar()
|
||||||
|
.baz()).quux()
|
||||||
|
|
||||||
|
val x5 = (foo()).bar()
|
||||||
|
.baz()
|
||||||
|
.quux()
|
||||||
|
|
||||||
|
val x6 = foo!!.bar()
|
||||||
|
.baz()!!
|
||||||
|
.quux()!!
|
||||||
|
|
||||||
|
val x7 = foo!!.bar()
|
||||||
|
.baz()!!
|
||||||
|
.quux()!!
|
||||||
|
|
||||||
|
val x8 = foo!!!!!!!!.bar()
|
||||||
|
.baz()!!
|
||||||
|
.quux()!!
|
||||||
|
|
||||||
|
val x9 = ((b!!)!!!!)!!.f
|
||||||
|
|
||||||
val y = xyzzy(foo.bar()
|
val y = xyzzy(foo.bar()
|
||||||
.baz()
|
.baz()
|
||||||
.quux())
|
.quux())
|
||||||
|
|||||||
@@ -1,5 +1,21 @@
|
|||||||
val x = foo.bar().baz().quux()
|
val x = foo.bar().baz().quux()
|
||||||
|
|
||||||
|
val x2 = foo().bar().baz().quux()
|
||||||
|
|
||||||
|
val x3 = ((foo().bar())).baz().quux()
|
||||||
|
|
||||||
|
val x4 = (foo().bar().baz()).quux()
|
||||||
|
|
||||||
|
val x5 = (foo()).bar().baz().quux()
|
||||||
|
|
||||||
|
val x6 = foo!!.bar().baz()!!.quux()!!
|
||||||
|
|
||||||
|
val x7 = foo!!.bar().baz()!!.quux()!!
|
||||||
|
|
||||||
|
val x8 = foo!!!!!!!!.bar().baz()!!.quux()!!
|
||||||
|
|
||||||
|
val x9 = ((b!!)!!!!)!!.f
|
||||||
|
|
||||||
val y = xyzzy(foo.bar().baz().quux())
|
val y = xyzzy(foo.bar().baz().quux())
|
||||||
|
|
||||||
fun foo() {
|
fun foo() {
|
||||||
|
|||||||
@@ -0,0 +1,116 @@
|
|||||||
|
fun test() {
|
||||||
|
INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.adad.adad
|
||||||
|
|
||||||
|
INSTANCE.adad.adad
|
||||||
|
|
||||||
|
INSTANCE.adad
|
||||||
|
|
||||||
|
INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (INSTANCE)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (((INSTANCE)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww))
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE.adad.adad
|
||||||
|
|
||||||
|
val b = INSTANCE.adad
|
||||||
|
|
||||||
|
val b = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE!!!!
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE!!
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = if (INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
if (INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
if ((INSTANCE)
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
val bawdawdwad = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.adad.adawd
|
||||||
|
|
||||||
|
val c = INSTANCE()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
val b = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val bawdawdwad = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.adad.adawd
|
||||||
|
|
||||||
|
|
||||||
|
// SET_INT: METHOD_CALL_CHAIN_WRAP = 1
|
||||||
|
// SET_FALSE: WRAP_FIRST_METHOD_IN_CALL_CHAIN
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
fun test() {
|
||||||
|
INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.adad.adad
|
||||||
|
|
||||||
|
INSTANCE.adad.adad
|
||||||
|
|
||||||
|
INSTANCE.adad
|
||||||
|
|
||||||
|
INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (((INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE.adad.adad
|
||||||
|
|
||||||
|
val b = INSTANCE.adad
|
||||||
|
|
||||||
|
val b = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE!!!!.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE!!.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = if (INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
if (INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
if ((INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
val bawdawdwad = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.adad.adawd
|
||||||
|
|
||||||
|
val c = INSTANCE().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
val b = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val bawdawdwad = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww()
|
||||||
|
.adad.adawd
|
||||||
|
|
||||||
|
|
||||||
|
// SET_INT: METHOD_CALL_CHAIN_WRAP = 1
|
||||||
|
// SET_FALSE: WRAP_FIRST_METHOD_IN_CALL_CHAIN
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
fun test() {
|
||||||
|
INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.adad.adad
|
||||||
|
|
||||||
|
INSTANCE.adad.adad
|
||||||
|
|
||||||
|
INSTANCE.adad
|
||||||
|
|
||||||
|
INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
(INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = (((INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE.adad.adad
|
||||||
|
|
||||||
|
val b = INSTANCE.adad
|
||||||
|
|
||||||
|
val b = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE!!!!.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = INSTANCE!!.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val b = if (INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
if (INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
if ((INSTANCE).awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww == INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww)
|
||||||
|
true
|
||||||
|
else
|
||||||
|
false
|
||||||
|
|
||||||
|
val bawdawdwad = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww().adad.adawd
|
||||||
|
|
||||||
|
val c = INSTANCE().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
val b = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val bawdawdwad = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww
|
||||||
|
|
||||||
|
val c = INSTANCE().awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww.awswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswswwawswswswswswswsww().adad.adawd
|
||||||
|
|
||||||
|
|
||||||
|
// SET_INT: METHOD_CALL_CHAIN_WRAP = 1
|
||||||
|
// SET_FALSE: WRAP_FIRST_METHOD_IN_CALL_CHAIN
|
||||||
@@ -867,6 +867,11 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
|
|||||||
runTest("idea/testData/formatter/callChain/CallChainWrapping.after.kt");
|
runTest("idea/testData/formatter/callChain/CallChainWrapping.after.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("CallChainWrapping2.after.kt")
|
||||||
|
public void testCallChainWrapping2() throws Exception {
|
||||||
|
runTest("idea/testData/formatter/callChain/CallChainWrapping2.after.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("CallChainWrappingChopDown.after.kt")
|
@TestMetadata("CallChainWrappingChopDown.after.kt")
|
||||||
public void testCallChainWrappingChopDown() throws Exception {
|
public void testCallChainWrappingChopDown() throws Exception {
|
||||||
runTest("idea/testData/formatter/callChain/CallChainWrappingChopDown.after.kt");
|
runTest("idea/testData/formatter/callChain/CallChainWrappingChopDown.after.kt");
|
||||||
@@ -1437,6 +1442,11 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
|
|||||||
runTest("idea/testData/formatter/callChain/CallChainWrapping.after.inv.kt");
|
runTest("idea/testData/formatter/callChain/CallChainWrapping.after.inv.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("CallChainWrapping2.after.inv.kt")
|
||||||
|
public void testCallChainWrapping2() throws Exception {
|
||||||
|
runTest("idea/testData/formatter/callChain/CallChainWrapping2.after.inv.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("CallChainWrappingChopDown.after.inv.kt")
|
@TestMetadata("CallChainWrappingChopDown.after.inv.kt")
|
||||||
public void testCallChainWrappingChopDown() throws Exception {
|
public void testCallChainWrappingChopDown() throws Exception {
|
||||||
runTest("idea/testData/formatter/callChain/CallChainWrappingChopDown.after.inv.kt");
|
runTest("idea/testData/formatter/callChain/CallChainWrappingChopDown.after.inv.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user