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

Formatter: handle spaces before value arguments list (KT-12634)

Browse Source 
#KT-12634 Fixed
This commit is contained in:
Kirill Rakhman
2016-06-06 18:39:10 +02:00
committed by Nikolay Krasko
parent 922dc85e11
commit 5c68681f96
17 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+1
View File
@@ -226,6 +226,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
aroundInside(ARROW, FUNCTION_TYPE).spaceIf(kotlinSettings.SPACE_AROUND_FUNCTION_TYPE_ARROW)
before(VALUE_ARGUMENT_LIST).spaces(0)
between(VALUE_ARGUMENT_LIST, LAMBDA_ARGUMENT).spaces(1)
betweenInside(REFERENCE_EXPRESSION, LAMBDA_ARGUMENT, CALL_EXPRESSION).spaces(1)
betweenInside(TYPE_ARGUMENT_LIST, LAMBDA_ARGUMENT, CALL_EXPRESSION).spaces(1)
idea/testData/formatter/MethodCall.after.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun foo() {
foo()
}
idea/testData/formatter/MethodCall.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun foo() {
foo ()
}
idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/C.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ class C(private val b: A.B) {
A.O.Y()
A.O.foo(A.O.bar)
with (A.O) {
with(A.O) {
A.Companion.Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/test.kt
Vendored
+1 -1
View File
@@ -55,7 +55,7 @@ class A {
O.Y()
O.foo(O.bar)
with (O) {
with(O) {
Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/C.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ class C {
A.O.Y()
A.O.foo(A.O.bar)
with (A.O) {
with(A.O) {
A.Companion.Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/before/test.kt
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ class A {
O.Y()
O.foo(O.bar)
with (O) {
with(O) {
Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/B.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ class B {
A.O.Y()
A.O.foo(A.O.bar)
with (A.O) {
with(A.O) {
A.Companion.Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/before/test.kt
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@ class A {
O.Y()
O.foo(O.bar)
with (O) {
with(O) {
Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelWithThis/after/B.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ class B(private val a: A) {
A.O.Y()
A.O.foo(A.O.bar)
with (A.O) {
with(A.O) {
A.Companion.Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelWithThis/before/test.kt
Vendored
+1 -1
View File
@@ -54,7 +54,7 @@ class A {
O.Y()
O.foo(O.bar)
with (O) {
with(O) {
Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevel/after/B.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ class B {
A.O.Y()
A.O.foo(A.O.bar)
with (A.O) {
with(A.O) {
A.Companion.Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevel/before/test.kt
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@ class A {
O.Y()
O.foo(O.bar)
with (O) {
with(O) {
Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/objectToTopLevel/after/B.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ object B {
A.O.Y()
A.O.foo(A.O.bar)
with (A.O) {
with(A.O) {
A.Companion.Y()
foo(bar)
1.extFoo(1.extBar)
idea/testData/refactoring/move/kotlin/moveNestedClass/objectToTopLevel/before/test.kt
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@ class A {
O.Y()
O.foo(O.bar)
with (O) {
with(O) {
Y()
foo(bar)
1.extFoo(1.extBar)
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+6
View File
@@ -379,6 +379,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
doTest(fileName);
}
@TestMetadata("MethodCall.after.kt")
public void testMethodCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodCall.after.kt");
doTest(fileName);
}
@TestMetadata("Multideclaration.after.kt")
public void testMultideclaration() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Multideclaration.after.kt");
j2k/testData/fileOrElement/synchronizedStatement/singleLineExample.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
synchronized (s) {
synchronized(s) {
doSomething(s)
}