From 18ddac024929b8e95e05c28c3f1ff58660d9136f Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 27 May 2015 12:34:03 +0300 Subject: [PATCH] Corrected formatting in test data --- idea/testData/intentions/ifNullToElvis/Comments2.kt.after | 4 +++- .../fileOrElement/formatting/nonStaticMembersWithComments.kt | 2 -- .../formatting/staticAndNonStaticMembersWithComments.kt | 2 -- .../fileOrElement/formatting/staticMembersWithComments.kt | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/idea/testData/intentions/ifNullToElvis/Comments2.kt.after b/idea/testData/intentions/ifNullToElvis/Comments2.kt.after index 55cc5df7eba..04e676ef183 100644 --- a/idea/testData/intentions/ifNullToElvis/Comments2.kt.after +++ b/idea/testData/intentions/ifNullToElvis/Comments2.kt.after @@ -1,5 +1,7 @@ fun foo(p: List): Int { - val v = p[0] ?: return -1 // v is null // we should do something with it // let's return -1 + val v = p[0] ?: return -1 // v is null + // we should do something with it + // let's return -1 // end of if return v.length() } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt index c9db751a9de..e013b7ff0f8 100644 --- a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt @@ -11,8 +11,6 @@ class F { //c3 - - //c4 fun f2() { diff --git a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt index c7d3dc4e925..7e14f14f9d9 100644 --- a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt @@ -4,8 +4,6 @@ class F { //c3 - - //c4 fun f2() { diff --git a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt index 87751a665e9..e8e04ad0a1d 100644 --- a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt @@ -11,8 +11,6 @@ object F { //c3 - - //c4 fun f2() {