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

TrailingCommaPostFormatProcessor: should work with call-site in limited mode

Browse Source 
* remove useless comma
* format call if comma exists

#KT-39079 Fixed
This commit is contained in:
Dmitry Gridin
2020-05-22 16:43:23 +07:00
parent 86827dfc92
commit 262c9e6858
21 changed files with 301 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/trailingComma/util.kt
+7 -3
View File
@@ -40,14 +40,18 @@ private val TYPES_WITH_TRAILING_COMMA = TokenSet.orSet(
TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE, TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE,
) )
fun UserDataHolder.addTrailingCommaIsAllowedForThis(): Boolean { fun PsiElement.canAddTrailingCommaWithRegistryCheck(): Boolean {
val type = elementType(this) ?: return false val type = elementType(this) ?: return false
return type in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE || return type in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE ||
trailingCommaIsAllowedOnCallSite() && type in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE trailingCommaIsAllowedOnCallSite() && type in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE
} }
fun KotlinCodeStyleSettings.addTrailingCommaIsAllowedFor(element: UserDataHolder): Boolean = fun KotlinCodeStyleSettings.addTrailingCommaIsAllowedFor(element: UserDataHolder): Boolean = when (elementType(element)) {
ALLOW_TRAILING_COMMA && element.addTrailingCommaIsAllowedForThis() null -> false
in TYPES_WITH_TRAILING_COMMA_ON_DECLARATION_SITE -> ALLOW_TRAILING_COMMA
in TYPES_WITH_TRAILING_COMMA_ON_CALL_SITE -> ALLOW_TRAILING_COMMA_ON_CALL_SITE || trailingCommaIsAllowedOnCallSite()
else -> false
}
private fun elementType(userDataHolder: UserDataHolder): IElementType? = when (userDataHolder) { private fun elementType(userDataHolder: UserDataHolder): IElementType? = when (userDataHolder) {
is ASTNode -> PsiUtilCore.getElementType(userDataHolder) is ASTNode -> PsiUtilCore.getElementType(userDataHolder)
idea/src/org/jetbrains/kotlin/idea/formatter/TrailingCommaPostFormatProcessor.kt
+2 -7
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaHelper.fin
import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaHelper.trailingCommaOrLastElement import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaHelper.trailingCommaOrLastElement
import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaState import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaState
import org.jetbrains.kotlin.idea.formatter.trailingComma.addTrailingCommaIsAllowedFor import org.jetbrains.kotlin.idea.formatter.trailingComma.addTrailingCommaIsAllowedFor
import org.jetbrains.kotlin.idea.formatter.trailingComma.addTrailingCommaIsAllowedForThis
import org.jetbrains.kotlin.idea.util.leafIgnoringWhitespace import org.jetbrains.kotlin.idea.util.leafIgnoringWhitespace
import org.jetbrains.kotlin.idea.util.leafIgnoringWhitespaceAndComments import org.jetbrains.kotlin.idea.util.leafIgnoringWhitespaceAndComments
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
@@ -40,12 +39,8 @@ class TrailingCommaPostFormatProcessor : PostFormatProcessor {
private class TrailingCommaPostFormatVisitor(val settings: CodeStyleSettings) : TrailingCommaVisitor() { private class TrailingCommaPostFormatVisitor(val settings: CodeStyleSettings) : TrailingCommaVisitor() {
private val myPostProcessor = PostFormatProcessorHelper(settings.kotlinCommonSettings) private val myPostProcessor = PostFormatProcessorHelper(settings.kotlinCommonSettings)
override fun process(trailingCommaContext: TrailingCommaContext) { override fun process(trailingCommaContext: TrailingCommaContext) = processIfInRange(trailingCommaContext.ktElement) {
val ktElement = trailingCommaContext.ktElement processCommaOwner(trailingCommaContext)
if (!ktElement.addTrailingCommaIsAllowedForThis()) return
processIfInRange(ktElement) {
processCommaOwner(trailingCommaContext)
}
} }
private fun processIfInRange(element: KtElement, block: () -> Unit = {}) { private fun processIfInRange(element: KtElement, block: () -> Unit = {}) {
idea/src/org/jetbrains/kotlin/idea/inspections/TrailingCommaInspection.kt
+1 -1
View File
@@ -40,7 +40,7 @@ class TrailingCommaInspection(
override fun process(trailingCommaContext: TrailingCommaContext) { override fun process(trailingCommaContext: TrailingCommaContext) {
val element = trailingCommaContext.ktElement val element = trailingCommaContext.ktElement
if (!element.addTrailingCommaIsAllowedForThis()) return if (!element.canAddTrailingCommaWithRegistryCheck()) return
useTrailingComma = CodeStyle.getSettings(element.project).kotlinCustomSettings.ALLOW_TRAILING_COMMA useTrailingComma = CodeStyle.getSettings(element.project).kotlinCustomSettings.ALLOW_TRAILING_COMMA
when (trailingCommaContext.state) { when (trailingCommaContext.state) {
idea/src/org/jetbrains/kotlin/idea/intentions/TrailingCommaIntention.kt
+2 -2
View File
@@ -10,7 +10,7 @@ import com.intellij.codeInsight.intention.LowPriorityAction
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.formatter.kotlinCustomSettings import org.jetbrains.kotlin.idea.formatter.kotlinCustomSettings
import org.jetbrains.kotlin.idea.formatter.trailingComma.addTrailingCommaIsAllowedForThis import org.jetbrains.kotlin.idea.formatter.trailingComma.canAddTrailingCommaWithRegistryCheck
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
class TrailingCommaIntention : SelfTargetingIntention<KtElement>( class TrailingCommaIntention : SelfTargetingIntention<KtElement>(
@@ -22,7 +22,7 @@ class TrailingCommaIntention : SelfTargetingIntention<KtElement>(
kotlinCustomSettings.ALLOW_TRAILING_COMMA = !kotlinCustomSettings.ALLOW_TRAILING_COMMA kotlinCustomSettings.ALLOW_TRAILING_COMMA = !kotlinCustomSettings.ALLOW_TRAILING_COMMA
} }
override fun isApplicableTo(element: KtElement, caretOffset: Int): Boolean = element.addTrailingCommaIsAllowedForThis().also { override fun isApplicableTo(element: KtElement, caretOffset: Int): Boolean = element.canAddTrailingCommaWithRegistryCheck().also {
val actionNumber = 1.takeIf { CodeStyle.getSettings(element.project).kotlinCustomSettings.ALLOW_TRAILING_COMMA } ?: 0 val actionNumber = 1.takeIf { CodeStyle.getSettings(element.project).kotlinCustomSettings.ALLOW_TRAILING_COMMA } ?: 0
setTextGetter(KotlinBundle.lazyMessage("intention.trailing.comma.custom.text", actionNumber)) setTextGetter(KotlinBundle.lazyMessage("intention.trailing.comma.custom.text", actionNumber))
} }
idea/src/org/jetbrains/kotlin/idea/joinLines/JoinWithTrailingCommaHandler.kt
+2 -2
View File
@@ -13,7 +13,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager
import org.jetbrains.kotlin.idea.core.util.containsLineBreakInRange import org.jetbrains.kotlin.idea.core.util.containsLineBreakInRange
import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaHelper import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaHelper
import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaState import org.jetbrains.kotlin.idea.formatter.trailingComma.TrailingCommaState
import org.jetbrains.kotlin.idea.formatter.trailingComma.addTrailingCommaIsAllowedForThis import org.jetbrains.kotlin.idea.formatter.trailingComma.canAddTrailingCommaWithRegistryCheck
import org.jetbrains.kotlin.idea.formatter.trailingComma.existsOrMissing import org.jetbrains.kotlin.idea.formatter.trailingComma.existsOrMissing
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -26,7 +26,7 @@ class JoinWithTrailingCommaHandler : JoinLinesHandlerDelegate {
val commaOwner = file.findElementAt(start) val commaOwner = file.findElementAt(start)
?.parentsWithSelf ?.parentsWithSelf
?.filter { !document.containsLineBreakInRange(it.textRange) } ?.filter { !document.containsLineBreakInRange(it.textRange) }
?.findLast { it.addTrailingCommaIsAllowedForThis() } as? KtElement ?.findLast { it.canAddTrailingCommaWithRegistryCheck() } as? KtElement
?: return CANNOT_JOIN ?: return CANNOT_JOIN
if (TrailingCommaState.stateForElement(commaOwner).existsOrMissing) return CANNOT_JOIN if (TrailingCommaState.stateForElement(commaOwner).existsOrMissing) return CANNOT_JOIN
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.after.inv.kt
Vendored
+7 -7
View File
@@ -3,7 +3,7 @@
@Anno([1]) @Anno([1])
fun a() = Unit fun a() = Unit
@Anno([1, ]) @Anno([1])
fun a() = Unit fun a() = Unit
@Anno([1 @Anno([1
@@ -22,7 +22,7 @@ fun a() = Unit
@Anno([1, 2]) @Anno([1, 2])
fun a() = Unit fun a() = Unit
@Anno([1, 2, ]) @Anno([1, 2])
fun a() = Unit fun a() = Unit
@Anno([1, 2 @Anno([1, 2
@@ -41,7 +41,7 @@ fun a() = Unit
@Anno([1, 2, 2]) @Anno([1, 2, 2])
fun a() = Unit fun a() = Unit
@Anno([1, 2, 2, ]) @Anno([1, 2, 2])
fun a() = Unit fun a() = Unit
@Anno(["1" @Anno(["1"
@@ -74,8 +74,8 @@ fun a() = Unit
/* /*
*/ */
// d // d
1/* 1,/*
*/,/* *//*
*/ */
]) ])
fun a() = Unit fun a() = Unit
@@ -91,8 +91,8 @@ fun a() = Unit
@Anno([ @Anno([
1, 1,
2/* 2,/*
*/,/* *//*
*/ */
]) ])
fun a() = Unit fun a() = Unit
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.after.kt
Vendored
+7 -7
View File
@@ -3,7 +3,7 @@
@Anno([1]) @Anno([1])
fun a() = Unit fun a() = Unit
@Anno([1, ]) @Anno([1])
fun a() = Unit fun a() = Unit
@Anno([1 @Anno([1
@@ -22,7 +22,7 @@ fun a() = Unit
@Anno([1, 2]) @Anno([1, 2])
fun a() = Unit fun a() = Unit
@Anno([1, 2, ]) @Anno([1, 2])
fun a() = Unit fun a() = Unit
@Anno([1, 2 @Anno([1, 2
@@ -41,7 +41,7 @@ fun a() = Unit
@Anno([1, 2, 2]) @Anno([1, 2, 2])
fun a() = Unit fun a() = Unit
@Anno([1, 2, 2, ]) @Anno([1, 2, 2])
fun a() = Unit fun a() = Unit
@Anno(["1" @Anno(["1"
@@ -74,8 +74,8 @@ fun a() = Unit
/* /*
*/ */
// d // d
1/* 1,/*
*/,/* *//*
*/ */
]) ])
fun a() = Unit fun a() = Unit
@@ -91,8 +91,8 @@ fun a() = Unit
@Anno([ @Anno([
1, 1,
2/* 2,/*
*/,/* *//*
*/ */
]) ])
fun a() = Unit fun a() = Unit
idea/testData/formatter/trailingComma/indices/IndicesAccess.after.inv.kt
Vendored
+20 -18
View File
@@ -25,7 +25,7 @@ fun foo() {
foofoo foofoo
] ]
testtest[foofoo, ] testtest[foofoo]
testtest[foofoo, testtest[testtest[foofoo]]] testtest[foofoo, testtest[testtest[foofoo]]]
@@ -34,9 +34,9 @@ fun foo() {
testtest[testtest[foofoo]], testtest[testtest[foofoo]],
] ]
testtest[foofoo, testtest[testtest[foofoo, ]], testsa] testtest[foofoo, testtest[testtest[foofoo]], testsa]
testtest[foofoo, seee, testtest[testtest[foofoo, ]], testsa] testtest[foofoo, seee, testtest[testtest[foofoo]], testsa]
useCallable["A", Callable { println["Hello world"] }] useCallable["A", Callable { println["Hello world"] }]
@@ -48,7 +48,7 @@ fun foo() {
useCallable[Callable { println["Hello world"] }] useCallable[Callable { println["Hello world"] }]
useCallable[Callable { println["Hello world"] }, ] useCallable[Callable { println["Hello world"] }]
useCallable[ useCallable[
Callable { Callable {
@@ -76,7 +76,7 @@ fun foo() {
useCallable[{ println["Hello world"] }] useCallable[{ println["Hello world"] }]
useCallable[{ println["Hello world"] }, ] useCallable[{ println["Hello world"] }]
useCallable[ useCallable[
{ println["Hello world"] }, { println["Hello world"] },
@@ -104,7 +104,7 @@ fun foo() {
override fun call() { override fun call() {
println["Hello world"] println["Hello world"]
} }
}, foo[0, ]] }, foo[0]]
useCallable[object : Callable<Unit> { useCallable[object : Callable<Unit> {
override fun call() { override fun call() {
@@ -112,11 +112,13 @@ fun foo() {
} }
}] }]
useCallable[object : Callable<Unit> { useCallable[
override fun call() { object : Callable<Unit> {
println["Hello world"] override fun call() {
} println["Hello world"]
}, ] }
},
]
useCallable[object : Callable<Unit> { useCallable[object : Callable<Unit> {
override fun call() { override fun call() {
@@ -171,7 +173,7 @@ fun foo() {
foofoo foofoo
] ]
testtest[foofoo,/**/] testtest[foofoo/**/]
testtest[foofoo, foofoo, foofoo, foofoo/* testtest[foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -184,7 +186,7 @@ fun foo() {
foofoo foofoo
] ]
testtest[foofoo,/**/] testtest[foofoo/**/]
testtest[ testtest[
foofoo, fososos,/* foofoo, fososos,/*
@@ -192,16 +194,16 @@ fun foo() {
testtest[testtest[foofoo]], testtest[testtest[foofoo]],
] ]
testtest[foofoo, testtest[testtest[foofoo, ]], /**/testsa] testtest[foofoo, testtest[testtest[foofoo]], /**/testsa]
testtest[foofoo, testtest[testtest[foofoo, ]]/* */, /**/testsa] testtest[foofoo, testtest[testtest[foofoo]]/* */, /**/testsa]
testtest[foofoo, testtest[testtest[foofoo, ]]/* testtest[foofoo, testtest[testtest[foofoo]]/*
*/, testsa] */, testsa]
testtest[foofoo, seee, testtest[testtest[foofoo, ]], /**/testsa] testtest[foofoo, seee, testtest[testtest[foofoo]], /**/testsa]
testtest[foofoo, seee, testtest[testtest[foofoo, ]], /* testtest[foofoo, seee, testtest[testtest[foofoo]], /*
*/testsa] */testsa]
useCallable["B", "C", Callable { useCallable["B", "C", Callable {
idea/testData/formatter/trailingComma/indices/IndicesAccess.after.kt
Vendored
+20 -18
View File
@@ -25,7 +25,7 @@ fun foo() {
foofoo foofoo
] ]
testtest[foofoo, ] testtest[foofoo]
testtest[foofoo, testtest[testtest[foofoo]]] testtest[foofoo, testtest[testtest[foofoo]]]
@@ -34,9 +34,9 @@ fun foo() {
testtest[testtest[foofoo]], testtest[testtest[foofoo]],
] ]
testtest[foofoo, testtest[testtest[foofoo, ]], testsa] testtest[foofoo, testtest[testtest[foofoo]], testsa]
testtest[foofoo, seee, testtest[testtest[foofoo, ]], testsa] testtest[foofoo, seee, testtest[testtest[foofoo]], testsa]
useCallable["A", Callable { println["Hello world"] }] useCallable["A", Callable { println["Hello world"] }]
@@ -48,7 +48,7 @@ fun foo() {
useCallable[Callable { println["Hello world"] }] useCallable[Callable { println["Hello world"] }]
useCallable[Callable { println["Hello world"] }, ] useCallable[Callable { println["Hello world"] }]
useCallable[ useCallable[
Callable { Callable {
@@ -76,7 +76,7 @@ fun foo() {
useCallable[{ println["Hello world"] }] useCallable[{ println["Hello world"] }]
useCallable[{ println["Hello world"] }, ] useCallable[{ println["Hello world"] }]
useCallable[ useCallable[
{ println["Hello world"] }, { println["Hello world"] },
@@ -104,7 +104,7 @@ fun foo() {
override fun call() { override fun call() {
println["Hello world"] println["Hello world"]
} }
}, foo[0, ]] }, foo[0]]
useCallable[object : Callable<Unit> { useCallable[object : Callable<Unit> {
override fun call() { override fun call() {
@@ -112,11 +112,13 @@ fun foo() {
} }
}] }]
useCallable[object : Callable<Unit> { useCallable[
override fun call() { object : Callable<Unit> {
println["Hello world"] override fun call() {
} println["Hello world"]
}, ] }
},
]
useCallable[object : Callable<Unit> { useCallable[object : Callable<Unit> {
override fun call() { override fun call() {
@@ -171,7 +173,7 @@ fun foo() {
foofoo foofoo
] ]
testtest[foofoo,/**/] testtest[foofoo/**/]
testtest[foofoo, foofoo, foofoo, foofoo/* testtest[foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -184,7 +186,7 @@ fun foo() {
foofoo foofoo
] ]
testtest[foofoo,/**/] testtest[foofoo/**/]
testtest[ testtest[
foofoo, fososos,/* foofoo, fososos,/*
@@ -192,16 +194,16 @@ fun foo() {
testtest[testtest[foofoo]], testtest[testtest[foofoo]],
] ]
testtest[foofoo, testtest[testtest[foofoo, ]], /**/testsa] testtest[foofoo, testtest[testtest[foofoo]], /**/testsa]
testtest[foofoo, testtest[testtest[foofoo, ]]/* */, /**/testsa] testtest[foofoo, testtest[testtest[foofoo]]/* */, /**/testsa]
testtest[foofoo, testtest[testtest[foofoo, ]]/* testtest[foofoo, testtest[testtest[foofoo]]/*
*/, testsa] */, testsa]
testtest[foofoo, seee, testtest[testtest[foofoo, ]], /**/testsa] testtest[foofoo, seee, testtest[testtest[foofoo]], /**/testsa]
testtest[foofoo, seee, testtest[testtest[foofoo, ]], /* testtest[foofoo, seee, testtest[testtest[foofoo]], /*
*/testsa] */testsa]
useCallable["B", "C", Callable { useCallable["B", "C", Callable {
idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.after.inv.kt
Vendored
+11 -11
View File
@@ -35,19 +35,19 @@ fun foo() {
foofoo foofoo
>() >()
testtest<foofoo, >() testtest<foofoo>()
testtest<foofoo, testtest<testtest<foofoo>>>() testtest<foofoo, testtest<testtest<foofoo>>>()
testtest<foofoo, fososos, testtest<testtest<foofoo>>, >() testtest<foofoo, fososos, testtest<testtest<foofoo>>>()
testtest< testtest<
foofoo, fososos, testtest<testtest<foofoo>>, foofoo, fososos, testtest<testtest<foofoo>>,
>() >()
testtest<foofoo, testtest<testtest<foofoo, >>, testsa>() testtest<foofoo, testtest<testtest<foofoo>>, testsa>()
testtest<foofoo, *, testtest<testtest<foofoo, >>, testsa>() testtest<foofoo, *, testtest<testtest<foofoo>>, testsa>()
testtest< testtest<
foofoo, foofoo, foofoo, foofoo, foofoo, foofoo, foofoo, foofoo,
@@ -80,7 +80,7 @@ fun foo() {
foofoo foofoo
>() >()
testtest<foofoo,/**/>() testtest<foofoo/**/>()
testtest<foofoo, foofoo, foofoo, foofoo/* testtest<foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -93,7 +93,7 @@ fun foo() {
foofoo foofoo
>() >()
testtest<foofoo,/**/>() testtest<foofoo/**/>()
testtest< testtest<
foofoo,/* foofoo,/*
@@ -110,15 +110,15 @@ fun foo() {
testtest<testtest<foofoo>>, testtest<testtest<foofoo>>,
>() >()
testtest<foofoo, testtest<testtest<foofoo, >>, /**/testsa>() testtest<foofoo, testtest<testtest<foofoo>>, /**/testsa>()
testtest<foofoo, testtest<testtest<foofoo, >>/* */, /**/testsa>() testtest<foofoo, testtest<testtest<foofoo>>/* */, /**/testsa>()
testtest<foofoo, testtest<testtest<foofoo, >>/* testtest<foofoo, testtest<testtest<foofoo>>/*
*/, testsa>() */, testsa>()
testtest<foofoo, seee, testtest<testtest<foofoo, >>, /**/testsa>() testtest<foofoo, seee, testtest<testtest<foofoo>>, /**/testsa>()
testtest<foofoo, seee, testtest<testtest<foofoo, >>, /* testtest<foofoo, seee, testtest<testtest<foofoo>>, /*
*/testsa>() */testsa>()
} }
idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.after.kt
Vendored
+11 -11
View File
@@ -35,19 +35,19 @@ fun foo() {
foofoo foofoo
>() >()
testtest<foofoo, >() testtest<foofoo>()
testtest<foofoo, testtest<testtest<foofoo>>>() testtest<foofoo, testtest<testtest<foofoo>>>()
testtest<foofoo, fososos, testtest<testtest<foofoo>>, >() testtest<foofoo, fososos, testtest<testtest<foofoo>>>()
testtest< testtest<
foofoo, fososos, testtest<testtest<foofoo>>, foofoo, fososos, testtest<testtest<foofoo>>,
>() >()
testtest<foofoo, testtest<testtest<foofoo, >>, testsa>() testtest<foofoo, testtest<testtest<foofoo>>, testsa>()
testtest<foofoo, *, testtest<testtest<foofoo, >>, testsa>() testtest<foofoo, *, testtest<testtest<foofoo>>, testsa>()
testtest< testtest<
foofoo, foofoo, foofoo, foofoo, foofoo, foofoo, foofoo, foofoo,
@@ -80,7 +80,7 @@ fun foo() {
foofoo foofoo
>() >()
testtest<foofoo,/**/>() testtest<foofoo/**/>()
testtest<foofoo, foofoo, foofoo, foofoo/* testtest<foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -93,7 +93,7 @@ fun foo() {
foofoo foofoo
>() >()
testtest<foofoo,/**/>() testtest<foofoo/**/>()
testtest< testtest<
foofoo,/* foofoo,/*
@@ -110,15 +110,15 @@ fun foo() {
testtest<testtest<foofoo>>, testtest<testtest<foofoo>>,
>() >()
testtest<foofoo, testtest<testtest<foofoo, >>, /**/testsa>() testtest<foofoo, testtest<testtest<foofoo>>, /**/testsa>()
testtest<foofoo, testtest<testtest<foofoo, >>/* */, /**/testsa>() testtest<foofoo, testtest<testtest<foofoo>>/* */, /**/testsa>()
testtest<foofoo, testtest<testtest<foofoo, >>/* testtest<foofoo, testtest<testtest<foofoo>>/*
*/, testsa>() */, testsa>()
testtest<foofoo, seee, testtest<testtest<foofoo, >>, /**/testsa>() testtest<foofoo, seee, testtest<testtest<foofoo>>, /**/testsa>()
testtest<foofoo, seee, testtest<testtest<foofoo, >>, /* testtest<foofoo, seee, testtest<testtest<foofoo>>, /*
*/testsa>() */testsa>()
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListChopAsNeeded.after.inv.kt
Vendored
+25 -23
View File
@@ -26,15 +26,15 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(testtest(foofoo))) testtest(foofoo, testtest(testtest(foofoo)))
testtest(foofoo, fososos, testtest(testtest(foofoo)), ) testtest(foofoo, fososos, testtest(testtest(foofoo)))
testtest(foofoo, testtest(testtest(foofoo, )), testsa) testtest(foofoo, testtest(testtest(foofoo)), testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), testsa)
useCallable("A", Callable { println("Hello world") }) useCallable("A", Callable { println("Hello world") })
@@ -46,7 +46,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -68,7 +68,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -90,7 +90,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -128,11 +128,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -187,7 +189,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, foofoo, foofoo, foofoo/* testtest(foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -200,7 +202,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, fososos,/* foofoo, fososos,/*
@@ -208,16 +210,16 @@ fun foo() {
testtest(testtest(foofoo)), testtest(testtest(foofoo)),
) )
testtest(foofoo, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* */, /**/testsa) testtest(foofoo, testtest(testtest(foofoo))/* */, /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* testtest(foofoo, testtest(testtest(foofoo))/*
*/, testsa) */, testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /* testtest(foofoo, seee, testtest(testtest(foofoo)), /*
*/testsa) */testsa)
useCallable("B", "C", Callable { useCallable("B", "C", Callable {
@@ -265,9 +267,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListChopAsNeeded.after.kt
Vendored
+25 -23
View File
@@ -26,15 +26,15 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(testtest(foofoo))) testtest(foofoo, testtest(testtest(foofoo)))
testtest(foofoo, fososos, testtest(testtest(foofoo)), ) testtest(foofoo, fososos, testtest(testtest(foofoo)))
testtest(foofoo, testtest(testtest(foofoo, )), testsa) testtest(foofoo, testtest(testtest(foofoo)), testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), testsa)
useCallable("A", Callable { println("Hello world") }) useCallable("A", Callable { println("Hello world") })
@@ -46,7 +46,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -68,7 +68,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -90,7 +90,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -128,11 +128,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -187,7 +189,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, foofoo, foofoo, foofoo/* testtest(foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -200,7 +202,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, fososos,/* foofoo, fososos,/*
@@ -208,16 +210,16 @@ fun foo() {
testtest(testtest(foofoo)), testtest(testtest(foofoo)),
) )
testtest(foofoo, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* */, /**/testsa) testtest(foofoo, testtest(testtest(foofoo))/* */, /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* testtest(foofoo, testtest(testtest(foofoo))/*
*/, testsa) */, testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /* testtest(foofoo, seee, testtest(testtest(foofoo)), /*
*/testsa) */testsa)
useCallable("B", "C", Callable { useCallable("B", "C", Callable {
@@ -265,9 +267,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListDoNotWrap.after.inv.kt
Vendored
+25 -23
View File
@@ -26,15 +26,15 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(testtest(foofoo))) testtest(foofoo, testtest(testtest(foofoo)))
testtest(foofoo, fososos, testtest(testtest(foofoo)), ) testtest(foofoo, fososos, testtest(testtest(foofoo)))
testtest(foofoo, testtest(testtest(foofoo, )), testsa) testtest(foofoo, testtest(testtest(foofoo)), testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), testsa)
useCallable("A", Callable { println("Hello world") }) useCallable("A", Callable { println("Hello world") })
@@ -46,7 +46,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -68,7 +68,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -90,7 +90,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -128,11 +128,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -187,7 +189,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, foofoo, foofoo, foofoo/* testtest(foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -200,7 +202,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, fososos,/* foofoo, fososos,/*
@@ -208,16 +210,16 @@ fun foo() {
testtest(testtest(foofoo)), testtest(testtest(foofoo)),
) )
testtest(foofoo, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* */, /**/testsa) testtest(foofoo, testtest(testtest(foofoo))/* */, /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* testtest(foofoo, testtest(testtest(foofoo))/*
*/, testsa) */, testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /* testtest(foofoo, seee, testtest(testtest(foofoo)), /*
*/testsa) */testsa)
useCallable("B", "C", Callable { useCallable("B", "C", Callable {
@@ -265,9 +267,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListDoNotWrap.after.kt
Vendored
+25 -23
View File
@@ -26,15 +26,15 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(testtest(foofoo))) testtest(foofoo, testtest(testtest(foofoo)))
testtest(foofoo, fososos, testtest(testtest(foofoo)), ) testtest(foofoo, fososos, testtest(testtest(foofoo)))
testtest(foofoo, testtest(testtest(foofoo, )), testsa) testtest(foofoo, testtest(testtest(foofoo)), testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), testsa)
useCallable("A", Callable { println("Hello world") }) useCallable("A", Callable { println("Hello world") })
@@ -46,7 +46,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -68,7 +68,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -90,7 +90,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -128,11 +128,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -187,7 +189,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, foofoo, foofoo, foofoo/* testtest(foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -200,7 +202,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, fososos,/* foofoo, fososos,/*
@@ -208,16 +210,16 @@ fun foo() {
testtest(testtest(foofoo)), testtest(testtest(foofoo)),
) )
testtest(foofoo, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* */, /**/testsa) testtest(foofoo, testtest(testtest(foofoo))/* */, /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* testtest(foofoo, testtest(testtest(foofoo))/*
*/, testsa) */, testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /* testtest(foofoo, seee, testtest(testtest(foofoo)), /*
*/testsa) */testsa)
useCallable("B", "C", Callable { useCallable("B", "C", Callable {
@@ -265,9 +267,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListWrapAlways.after.inv.kt
Vendored
+28 -24
View File
@@ -50,22 +50,24 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo))) testtest(testtest(foofoo)))
testtest(foofoo, testtest(
foofoo,
fososos, fososos,
testtest(testtest(foofoo)), ) testtest(testtest(foofoo)),
)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, )), testtest(testtest(foofoo)),
testsa) testsa)
testtest(foofoo, testtest(foofoo,
seee, seee,
testtest(testtest(foofoo, )), testtest(testtest(foofoo)),
testsa) testsa)
useCallable("A", useCallable("A",
@@ -82,7 +84,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -108,7 +110,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -134,7 +136,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -177,11 +179,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -254,7 +258,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, testtest(foofoo,
foofoo, foofoo,
@@ -271,7 +275,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, foofoo,
@@ -281,26 +285,26 @@ fun foo() {
) )
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, )), /**/ testtest(testtest(foofoo)), /**/
testsa) testsa)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, ))/* */, /**/ testtest(testtest(foofoo))/* */, /**/
testsa) testsa)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, ))/* testtest(testtest(foofoo))/*
*/, */,
testsa) testsa)
testtest(foofoo, testtest(foofoo,
seee, seee,
testtest(testtest(foofoo, )), /**/ testtest(testtest(foofoo)), /**/
testsa) testsa)
testtest(foofoo, testtest(foofoo,
seee, seee,
testtest(testtest(foofoo, )), /* testtest(testtest(foofoo)), /*
*/ */
testsa) testsa)
@@ -356,9 +360,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListWrapAlways.after.kt
Vendored
+28 -24
View File
@@ -50,22 +50,24 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo))) testtest(testtest(foofoo)))
testtest(foofoo, testtest(
foofoo,
fososos, fososos,
testtest(testtest(foofoo)), ) testtest(testtest(foofoo)),
)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, )), testtest(testtest(foofoo)),
testsa) testsa)
testtest(foofoo, testtest(foofoo,
seee, seee,
testtest(testtest(foofoo, )), testtest(testtest(foofoo)),
testsa) testsa)
useCallable("A", useCallable("A",
@@ -82,7 +84,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -108,7 +110,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -134,7 +136,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -177,11 +179,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -254,7 +258,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, testtest(foofoo,
foofoo, foofoo,
@@ -271,7 +275,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, foofoo,
@@ -281,26 +285,26 @@ fun foo() {
) )
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, )), /**/ testtest(testtest(foofoo)), /**/
testsa) testsa)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, ))/* */, /**/ testtest(testtest(foofoo))/* */, /**/
testsa) testsa)
testtest(foofoo, testtest(foofoo,
testtest(testtest(foofoo, ))/* testtest(testtest(foofoo))/*
*/, */,
testsa) testsa)
testtest(foofoo, testtest(foofoo,
seee, seee,
testtest(testtest(foofoo, )), /**/ testtest(testtest(foofoo)), /**/
testsa) testsa)
testtest(foofoo, testtest(foofoo,
seee, seee,
testtest(testtest(foofoo, )), /* testtest(testtest(foofoo)), /*
*/ */
testsa) testsa)
@@ -356,9 +360,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListWrapAsNeeded.after.inv.kt
Vendored
+25 -23
View File
@@ -26,15 +26,15 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(testtest(foofoo))) testtest(foofoo, testtest(testtest(foofoo)))
testtest(foofoo, fososos, testtest(testtest(foofoo)), ) testtest(foofoo, fososos, testtest(testtest(foofoo)))
testtest(foofoo, testtest(testtest(foofoo, )), testsa) testtest(foofoo, testtest(testtest(foofoo)), testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), testsa)
useCallable("A", Callable { println("Hello world") }) useCallable("A", Callable { println("Hello world") })
@@ -46,7 +46,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -68,7 +68,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -90,7 +90,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -128,11 +128,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -187,7 +189,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, foofoo, foofoo, foofoo/* testtest(foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -200,7 +202,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, fososos,/* foofoo, fososos,/*
@@ -208,16 +210,16 @@ fun foo() {
testtest(testtest(foofoo)), testtest(testtest(foofoo)),
) )
testtest(foofoo, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* */, /**/testsa) testtest(foofoo, testtest(testtest(foofoo))/* */, /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* testtest(foofoo, testtest(testtest(foofoo))/*
*/, testsa) */, testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /* testtest(foofoo, seee, testtest(testtest(foofoo)), /*
*/testsa) */testsa)
useCallable("B", "C", Callable { useCallable("B", "C", Callable {
@@ -265,9 +267,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/testData/formatter/trailingComma/valueArguments/ArgumentListWrapAsNeeded.after.kt
Vendored
+25 -23
View File
@@ -26,15 +26,15 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo, ) testtest(foofoo)
testtest(foofoo, testtest(testtest(foofoo))) testtest(foofoo, testtest(testtest(foofoo)))
testtest(foofoo, fososos, testtest(testtest(foofoo)), ) testtest(foofoo, fososos, testtest(testtest(foofoo)))
testtest(foofoo, testtest(testtest(foofoo, )), testsa) testtest(foofoo, testtest(testtest(foofoo)), testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), testsa)
useCallable("A", Callable { println("Hello world") }) useCallable("A", Callable { println("Hello world") })
@@ -46,7 +46,7 @@ fun foo() {
useCallable(Callable { println("Hello world") }) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") }, ) useCallable(Callable { println("Hello world") })
useCallable(Callable { println("Hello world") } useCallable(Callable { println("Hello world") }
) )
@@ -68,7 +68,7 @@ fun foo() {
useCallable({ println("Hello world") }) useCallable({ println("Hello world") })
useCallable({ println("Hello world") }, ) useCallable({ println("Hello world") })
useCallable({ println("Hello world") } useCallable({ println("Hello world") }
) )
@@ -90,7 +90,7 @@ fun foo() {
useCallable(foo() { println("Hello world") }) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") }, ) useCallable(foo() { println("Hello world") })
useCallable(foo() { println("Hello world") } useCallable(foo() { println("Hello world") }
) )
@@ -128,11 +128,13 @@ fun foo() {
} }
}) })
useCallable(object : Callable<Unit> { useCallable(
override fun call() { object : Callable<Unit> {
println("Hello world") override fun call() {
} println("Hello world")
}, ) }
},
)
useCallable(object : Callable<Unit> { useCallable(object : Callable<Unit> {
override fun call() { override fun call() {
@@ -187,7 +189,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest(foofoo, foofoo, foofoo, foofoo/* testtest(foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar */, /* */ bar
@@ -200,7 +202,7 @@ fun foo() {
foofoo foofoo
) )
testtest(foofoo,/**/) testtest(foofoo/**/)
testtest( testtest(
foofoo, fososos,/* foofoo, fososos,/*
@@ -208,16 +210,16 @@ fun foo() {
testtest(testtest(foofoo)), testtest(testtest(foofoo)),
) )
testtest(foofoo, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* */, /**/testsa) testtest(foofoo, testtest(testtest(foofoo))/* */, /**/testsa)
testtest(foofoo, testtest(testtest(foofoo, ))/* testtest(foofoo, testtest(testtest(foofoo))/*
*/, testsa) */, testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /**/testsa) testtest(foofoo, seee, testtest(testtest(foofoo)), /**/testsa)
testtest(foofoo, seee, testtest(testtest(foofoo, )), /* testtest(foofoo, seee, testtest(testtest(foofoo)), /*
*/testsa) */testsa)
useCallable("B", "C", Callable { useCallable("B", "C", Callable {
@@ -265,9 +267,9 @@ fun foo() {
fun test() { fun test() {
baz( baz(
f = fun(it: Int): String = "$it" /*dwdwd f = fun(it: Int): String = "$it", /*dwdwd
*/, */
name = "" /* name = "", /*
*/, */
) )
} }
idea/tests/org/jetbrains/kotlin/formatter/AbstractFormatterTest.java
+4 -5
View File
@@ -125,7 +125,7 @@ public abstract class AbstractFormatterTest extends KotlinLightIdeaTestCase {
} }
public void doTestInvertedCallSite(@NotNull String expectedFileNameWithExtension) throws Exception { public void doTestInvertedCallSite(@NotNull String expectedFileNameWithExtension) throws Exception {
doTest(expectedFileNameWithExtension, true, true); doTest(expectedFileNameWithExtension, true, false);
} }
public void doTestCallSite(@NotNull String expectedFileNameWithExtension) throws Exception { public void doTestCallSite(@NotNull String expectedFileNameWithExtension) throws Exception {
@@ -138,7 +138,7 @@ public abstract class AbstractFormatterTest extends KotlinLightIdeaTestCase {
String originalFileText = FileUtil.loadFile(new File(testFileName + testFileExtension), true); String originalFileText = FileUtil.loadFile(new File(testFileName + testFileExtension), true);
CodeStyleSettings codeStyleSettings = CodeStyle.getSettings(getProject_()); CodeStyleSettings codeStyleSettings = CodeStyle.getSettings(getProject_());
RegistryValue registryValue = Registry.get("kotlin.formatter.allowTrailingCommaOnCallSite"); KotlinCodeStyleSettings customSettings = codeStyleSettings.getCustomSettings(KotlinCodeStyleSettings.class);
try { try {
Integer rightMargin = InTextDirectivesUtils.getPrefixedInt(originalFileText, "// RIGHT_MARGIN: "); Integer rightMargin = InTextDirectivesUtils.getPrefixedInt(originalFileText, "// RIGHT_MARGIN: ");
if (rightMargin != null) { if (rightMargin != null) {
@@ -147,7 +147,7 @@ public abstract class AbstractFormatterTest extends KotlinLightIdeaTestCase {
Boolean trailingComma = InTextDirectivesUtils.getPrefixedBoolean(originalFileText, "// TRAILING_COMMA: "); Boolean trailingComma = InTextDirectivesUtils.getPrefixedBoolean(originalFileText, "// TRAILING_COMMA: ");
if (trailingComma != null) { if (trailingComma != null) {
codeStyleSettings.getCustomSettings(KotlinCodeStyleSettings.class).ALLOW_TRAILING_COMMA = trailingComma; customSettings.ALLOW_TRAILING_COMMA = trailingComma;
} }
SettingsConfigurator configurator = FormatSettingsUtil.createConfigurator(originalFileText, codeStyleSettings); SettingsConfigurator configurator = FormatSettingsUtil.createConfigurator(originalFileText, codeStyleSettings);
@@ -158,12 +158,11 @@ public abstract class AbstractFormatterTest extends KotlinLightIdeaTestCase {
configurator.configureInvertedSettings(); configurator.configureInvertedSettings();
} }
registryValue.setValue(callSite); customSettings.ALLOW_TRAILING_COMMA_ON_CALL_SITE = callSite;
doTextTest(originalFileText, new File(expectedFileNameWithExtension), testFileExtension); doTextTest(originalFileText, new File(expectedFileNameWithExtension), testFileExtension);
} }
finally { finally {
codeStyleSettings.clearCodeStyleSettings(); codeStyleSettings.clearCodeStyleSettings();
registryValue.resetToDefault();
} }
} }
} }
idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+1 -1
View File
@@ -1435,7 +1435,7 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
""" """
fun foo(i: Int) = 1 fun foo(i: Int) = 1
fun test4() { fun test4() {
foo(1,<caret>) foo(1<caret>)
} }
""" """
) )