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

Formatter: support trailing comma in type arguments

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-26 20:08:04 +07:00
parent b99c7f8d14
commit ccd780c008
6 changed files with 480 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+4
View File
@@ -619,6 +619,10 @@ abstract class KotlinCommonBlock(
trailingCommaWrappingStrategyWithMultiLineCheck(LT, GT)(childElement) trailingCommaWrappingStrategyWithMultiLineCheck(LT, GT)(childElement)
} }
elementType === TYPE_ARGUMENT_LIST -> return { childElement ->
trailingCommaWrappingStrategyWithMultiLineCheck(LT, GT)(childElement)
}
elementType === SUPER_TYPE_LIST -> { elementType === SUPER_TYPE_LIST -> {
val wrap = Wrap.createWrap(commonSettings.EXTENDS_LIST_WRAP, false) val wrap = Wrap.createWrap(commonSettings.EXTENDS_LIST_WRAP, false)
return { childElement -> if (childElement.psi is KtSuperTypeListEntry) wrap else null } return { childElement -> if (childElement.psi is KtSuperTypeListEntry) wrap else null }
idea/src/org/jetbrains/kotlin/idea/formatter/TrailingCommaPostFormatProcessor.kt
+4
View File
@@ -50,6 +50,10 @@ private class TrailingCommaVisitor(val settings: CodeStyleSettings) : KtTreeVisi
super.visitTypeParameterList(list) super.visitTypeParameterList(list)
} }
override fun visitTypeArgumentList(typeArgumentList: KtTypeArgumentList) = processCommaOwnerIfInRange(typeArgumentList) {
super.visitTypeArgumentList(typeArgumentList)
}
private fun processCommaOwnerIfInRange(element: KtElement, preHook: () -> Unit = {}) { private fun processCommaOwnerIfInRange(element: KtElement, preHook: () -> Unit = {}) {
if (myPostProcessor.isElementPartlyInRange(element)) { if (myPostProcessor.isElementPartlyInRange(element)) {
preHook() preHook()
idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.after.inv.kt
Vendored
+133
View File
@@ -0,0 +1,133 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
fun foo() {
testtest<
foofoo,
testtest<
testtest<
foofoo,
>,
>,
testsa,
>()
testtest<foofoo, foofoo, foofoo,
foofoo, bar>()
testtest<
foofoo, foofoo, foofoo, foofoo, bar
>()
testtest<foofoo, foofoo, foofoo, foofoo, bar
>()
testtest<foofoo, foofoo, foofoo, foofoo,
bar
>()
testtest<foofoo
>()
testtest<
foofoo>()
testtest<
foofoo
>()
testtest<
foofoo,
>()
testtest<foofoo, testtest<testtest<foofoo>>>()
testtest<
foofoo, fososos, testtest<testtest<foofoo>>,
>()
testtest<foofoo, testtest<testtest<
foofoo,
>>, testsa>()
testtest<foofoo, *, testtest<testtest<
foofoo,
>>, testsa>()
testtest<
foofoo, foofoo, foofoo, foofoo,
bar /*
*/, /* */ foo
>()
testtest</*
*/foofoo, foofoo, foofoo, /*
*/
foofoo, bar>()
testtest<foofoo, foofoo, foofoo, foofoo, bar/*
*/>()
testtest<foofoo, foofoo, foofoo, foofoo, bar // awdawda
>()
testtest<foofoo, foofoo, foofoo, foofoo, /*
*/
bar
>()
testtest<foofoo // fd
>()
testtest< /**/
foofoo
>()
testtest<
foofoo,/**/
>()
testtest<foofoo, foofoo, foofoo, foofoo/*
*/, /* */ bar
>()
testtest<foofoo // fd
>()
testtest< /**/
foofoo
>()
testtest<
foofoo,/**/
>()
testtest<
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, seee, testtest<testtest<
foofoo,
>>, /**/testsa>()
testtest<foofoo, seee, testtest<testtest<
foofoo,
>>, /*
*/testsa>()
}
idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.after.kt
Vendored
+197
View File
@@ -0,0 +1,197 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
fun foo() {
testtest<
foofoo,
testtest<
testtest<
foofoo,
>,
>,
testsa,
>()
testtest<
foofoo, foofoo, foofoo,
foofoo, bar,
>()
testtest<
foofoo, foofoo, foofoo, foofoo, bar,
>()
testtest<
foofoo, foofoo, foofoo, foofoo, bar,
>()
testtest<
foofoo, foofoo, foofoo, foofoo,
bar,
>()
testtest<
foofoo,
>()
testtest<
foofoo,
>()
testtest<
foofoo,
>()
testtest<
foofoo,
>()
testtest<foofoo, testtest<testtest<foofoo>>>()
testtest<
foofoo, fososos, testtest<testtest<foofoo>>,
>()
testtest<
foofoo,
testtest<
testtest<
foofoo,
>,
>,
testsa,
>()
testtest<
foofoo, *,
testtest<
testtest<
foofoo,
>,
>,
testsa,
>()
testtest<
foofoo, foofoo, foofoo, foofoo,
bar, /*
*/ /* */
foo,
>()
testtest<
/*
*/
foofoo, foofoo, foofoo, /*
*/
foofoo, bar,
>()
testtest<
foofoo, foofoo, foofoo, foofoo,
bar,/*
*/
>()
testtest<
foofoo, foofoo, foofoo, foofoo, bar, // awdawda
>()
testtest<
foofoo, foofoo, foofoo, foofoo, /*
*/
bar,
>()
testtest<
foofoo, // fd
>()
testtest<
/**/
foofoo,
>()
testtest<
foofoo,/**/
>()
testtest<
foofoo, foofoo, foofoo,
foofoo,/*
*/ /* */
bar,
>()
testtest<
foofoo, // fd
>()
testtest<
/**/
foofoo,
>()
testtest<
foofoo,/**/
>()
testtest<
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, seee,
testtest<
testtest<
foofoo,
>,
>, /**/
testsa,
>()
testtest<
foofoo, seee,
testtest<
testtest<
foofoo,
>,
>, /*
*/
testsa,
>()
}
idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.kt
Vendored
+106
View File
@@ -0,0 +1,106 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
fun foo() {
testtest<foofoo,
testtest<testtest<
foofoo,
>,
>,
testsa,
>()
testtest<foofoo, foofoo, foofoo,
foofoo, bar>()
testtest<
foofoo, foofoo, foofoo, foofoo, bar
>()
testtest<foofoo, foofoo, foofoo, foofoo, bar
>()
testtest<foofoo, foofoo, foofoo, foofoo,
bar
>()
testtest<foofoo
>()
testtest<
foofoo>()
testtest<
foofoo
>()
testtest<foofoo,>()
testtest<foofoo, testtest<testtest<foofoo>>>()
testtest<foofoo, fososos, testtest<testtest<foofoo>>,>()
testtest<foofoo, testtest<testtest<foofoo,>>, testsa>()
testtest<foofoo, *, testtest<testtest<foofoo,>>, testsa>()
testtest<
foofoo, foofoo, foofoo, foofoo,
bar /*
*/, /* */ foo
>()
testtest</*
*/foofoo, foofoo, foofoo, /*
*/
foofoo, bar>()
testtest<foofoo, foofoo, foofoo, foofoo, bar/*
*/>()
testtest<foofoo, foofoo, foofoo, foofoo, bar // awdawda
>()
testtest<foofoo, foofoo, foofoo, foofoo, /*
*/
bar
>()
testtest<foofoo // fd
>()
testtest< /**/
foofoo
>()
testtest<foofoo,/**/>()
testtest<foofoo, foofoo, foofoo, foofoo/*
*/ , /* */ bar
>()
testtest<foofoo // fd
>()
testtest< /**/
foofoo
>()
testtest<foofoo,/**/>()
testtest<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, seee, testtest<testtest<foofoo,>>, /**/testsa>()
testtest<foofoo, seee, testtest<testtest<foofoo,>>, /*
*/testsa>()
}
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
Generated
+36
View File
@@ -1182,6 +1182,24 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
} }
} }
@TestMetadata("idea/testData/formatter/trailingComma/typeArguments")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TypeArguments extends AbstractFormatterTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInTypeArguments() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/formatter/trailingComma/typeArguments"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), null, true);
}
@TestMetadata("TypeArgumentList.after.kt")
public void testTypeArgumentList() throws Exception {
runTest("idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.after.kt");
}
}
@TestMetadata("idea/testData/formatter/trailingComma/typeParameters") @TestMetadata("idea/testData/formatter/trailingComma/typeParameters")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
@@ -1662,6 +1680,24 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
} }
} }
@TestMetadata("idea/testData/formatter/trailingComma/typeArguments")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TypeArguments extends AbstractFormatterTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTestInverted, this, testDataFilePath);
}
public void testAllFilesPresentInTypeArguments() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/formatter/trailingComma/typeArguments"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), null, true);
}
@TestMetadata("TypeArgumentList.after.inv.kt")
public void testTypeArgumentList() throws Exception {
runTest("idea/testData/formatter/trailingComma/typeArguments/TypeArgumentList.after.inv.kt");
}
}
@TestMetadata("idea/testData/formatter/trailingComma/typeParameters") @TestMetadata("idea/testData/formatter/trailingComma/typeParameters")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)