From f1b3bb6ae7adf1f08b4a493b6ce0eda7961a3d30 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Sun, 15 Feb 2015 23:57:54 +0300 Subject: [PATCH] Join Lines: Fix test data since IDEA now converts single-line comments to block ones when joining lines --- .../declarationAndAssignment/simpleInitWithComments.kt.after | 2 +- .../declarationAndAssignment/simpleInitWithComments2.kt.after | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments.kt.after b/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments.kt.after index 0c18301cde6..583b6a2bdcd 100644 --- a/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments.kt.after +++ b/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments.kt.after @@ -1,5 +1,5 @@ fun foo(n: Int) { // foo3 - val /* foo */ x: String = "" // foo2 // bar3 + val /* foo */ x: String = "" /* foo2*/ // bar3 /* baz */ } \ No newline at end of file diff --git a/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments2.kt.after b/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments2.kt.after index 0c18301cde6..583b6a2bdcd 100644 --- a/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments2.kt.after +++ b/idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments2.kt.after @@ -1,5 +1,5 @@ fun foo(n: Int) { // foo3 - val /* foo */ x: String = "" // foo2 // bar3 + val /* foo */ x: String = "" /* foo2*/ // bar3 /* baz */ } \ No newline at end of file