From a9f11d2c6412c709a929532d5e8bc7cd6cf8d9e6 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 11 Mar 2016 12:41:10 +0300
Subject: [PATCH] Always add new line space with space before to deal with
 KEEP_FIRST_COLUMN_COMMENT option

InvertIfConditionIntention, RemoveBracesIntention tests are affected

 #KT-4175 In Progress
---
 .../src/org/jetbrains/kotlin/psi/KtPsiFactory.kt       |  2 +-
 .../emptyImportDirective.kt.after                      |  2 +-
 .../emptyImportDirective2.kt.after                     |  4 ++--
 .../emptyPackageDirective.kt.after                     |  2 +-
 .../emptyPackageDirective2.kt.after                    |  6 +++---
 .../insertBeforeExtractFunction/manyImports.kt.after   |  6 +++---
 .../removeBracesFromIfWithCommentedCode.kt             |  8 ++++----
 .../removeBracesFromIfWithCommentedCode.kt.after       | 10 ++++------
 8 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
index b060205c253..845683e34e6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
@@ -143,7 +143,7 @@ class KtPsiFactory(private val project: Project) {
 
     // Remove when all Java usages are rewritten to Kotlin
     fun createNewLine(): PsiElement {
-        return createWhiteSpace("\n")
+        return createWhiteSpace("\n ")
     }
 
     fun createNewLine(lineBreaks: Int): PsiElement {
diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after
index dee0adbf270..6d1ac6e56da 100644
--- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after
+++ b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after
@@ -2,5 +2,5 @@ package foo
 
 fun main(args: Array<String>) {
     1 + 1
-println()
+ println()
 }
diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after
index 2ab2b98941e..0b48026f3f8 100644
--- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after
+++ b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after
@@ -1,8 +1,8 @@
 package foo
-import foo
+ import foo
 
 
 fun main(args: Array<String>) {
     1 + 1
-println()
+ println()
 }
diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after
index 7d04eb04f40..d79b6967d13 100644
--- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after
+++ b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after
@@ -1,4 +1,4 @@
 fun main(args: Array<String>) {
     1 + 1
-println()
+ println()
 }
diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after
index 8ceb31c56c0..38241a2c540 100644
--- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after
+++ b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after
@@ -1,6 +1,6 @@
 
-import foo.*
-fun main(args: Array<String>) {
+ import foo.*
+ fun main(args: Array<String>) {
     1 + 1
-println()
+ println()
 }
\ No newline at end of file
diff --git a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after
index 0a6bb3f48f6..d1dabe6f092 100644
--- a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after
+++ b/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after
@@ -2,11 +2,11 @@ package foo
 
 import a
 import b
-import a
-import b
+ import a
+ import b
 
 
 fun main(args: Array<String>) {
     1 + 1
-println()
+ println()
 }
diff --git a/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt b/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt
index 7656398ef6c..a44dbd94eb0 100644
--- a/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt
+++ b/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt
@@ -1,9 +1,9 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
-    <caret>if (true) {
-        //        val a = 1
-        //        var b = 1
+    if (true) <caret>{
+//        val a = 1
+//        var b = 1
         doSomething("test")
     }
 }
diff --git a/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt.after b/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt.after
index 7656398ef6c..31f37c54617 100644
--- a/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt.after
+++ b/idea/testData/intentions/removeBraces/removeBracesFromIfWithCommentedCode.kt.after
@@ -1,9 +1,7 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
-    <caret>if (true) {
-        //        val a = 1
-        //        var b = 1
-        doSomething("test")
-    }
+    //        val a = 1
+    //        var b = 1
+    if (true) doSomething("test")
 }