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

Implement parenthesis wrapping options

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-06-12 15:02:25 +02:00
parent 487d948ad3
commit a0b5a3a8a2
9 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+5 -4
View File
@@ -201,11 +201,9 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
after(LBRACKET).spaces(0)
before(RBRACKET).spaces(0)
after(LPAR).spaces(0)
before(RPAR).spaces(0)
afterInside(LPAR, VALUE_PARAMETER_LIST).spaces(0)
beforeInside(RPAR, VALUE_PARAMETER_LIST).spaces(0)
afterInside(LPAR, VALUE_PARAMETER_LIST).spaces(0, kotlinCommonSettings.METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE)
beforeInside(RPAR, VALUE_PARAMETER_LIST).spaces(0, kotlinCommonSettings.METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE)
afterInside(LT, TYPE_PARAMETER_LIST).spaces(0)
beforeInside(GT, TYPE_PARAMETER_LIST).spaces(0)
afterInside(LPAR, VALUE_ARGUMENT_LIST).spaces(0)
@@ -214,6 +212,9 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
beforeInside(GT, TYPE_ARGUMENT_LIST).spaces(0)
before(TYPE_ARGUMENT_LIST).spaces(0)
after(LPAR).spaces(0)
before(RPAR).spaces(0)
betweenInside(FOR_KEYWORD, LPAR, FOR).spaceIf(kotlinCommonSettings.SPACE_BEFORE_FOR_PARENTHESES)
betweenInside(IF_KEYWORD, LPAR, IF).spaceIf(kotlinCommonSettings.SPACE_BEFORE_IF_PARENTHESES)
betweenInside(WHILE_KEYWORD, LPAR, WHILE).spaceIf(kotlinCommonSettings.SPACE_BEFORE_WHILE_PARENTHESES)
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt
+7 -1
View File
@@ -46,6 +46,10 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
try { return foo1(12, 13, 14)
} catch (e: Exception) { return 0 } finally { if (true) { return 1 } else { return 2 } } }
private val f = {(a: Int)->a*2}
fun longMethod(param1: Int,
param2: String) {
}
}
enum class Enumeration {
@@ -198,7 +202,9 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
"CATCH_ON_NEW_LINE",
"FINALLY_ON_NEW_LINE",
"CALL_PARAMETERS_WRAP",
"METHOD_PARAMETERS_WRAP"
"METHOD_PARAMETERS_WRAP",
"METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE",
"METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE"
)
consumer.renameStandardOption(CodeStyleSettingsCustomizable.WRAPPING_SWITCH_STATEMENT, "'when' statements")
consumer.showCustomOption(KotlinCodeStyleSettings::class.java, "ALIGN_IN_COLUMNS_CASE_BRANCH", "Align 'when' branches in columns",
idea/testData/formatter/MethodLParenthOnNextLine.after.inv.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun foo(a: String,
b: String)
// SET_TRUE: METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE
idea/testData/formatter/MethodLParenthOnNextLine.after.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
fun foo(
a: String,
b: String)
// SET_TRUE: METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE
idea/testData/formatter/MethodLParenthOnNextLine.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun foo(a: String,
b: String)
// SET_TRUE: METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE
idea/testData/formatter/MethodRParenthOnNextLine.after.inv.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun foo(a: String,
b: String)
// SET_TRUE: METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE
idea/testData/formatter/MethodRParenthOnNextLine.after.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
fun foo(a: String,
b: String
)
// SET_TRUE: METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE
idea/testData/formatter/MethodRParenthOnNextLine.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun foo(a: String,
b: String)
// SET_TRUE: METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+24
View File
@@ -434,6 +434,18 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
doTest(fileName);
}
@TestMetadata("MethodLParenthOnNextLine.after.kt")
public void testMethodLParenthOnNextLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodLParenthOnNextLine.after.kt");
doTest(fileName);
}
@TestMetadata("MethodRParenthOnNextLine.after.kt")
public void testMethodRParenthOnNextLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodRParenthOnNextLine.after.kt");
doTest(fileName);
}
@TestMetadata("Multideclaration.after.kt")
public void testMultideclaration() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Multideclaration.after.kt");
@@ -1094,6 +1106,18 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
doTestInverted(fileName);
}
@TestMetadata("MethodLParenthOnNextLine.after.inv.kt")
public void testMethodLParenthOnNextLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodLParenthOnNextLine.after.inv.kt");
doTestInverted(fileName);
}
@TestMetadata("MethodRParenthOnNextLine.after.inv.kt")
public void testMethodRParenthOnNextLine() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodRParenthOnNextLine.after.inv.kt");
doTestInverted(fileName);
}
@TestMetadata("MultilineFunctionLiteralWithParams.after.inv.kt")
public void testMultilineFunctionLiteralWithParams() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.inv.kt");