diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt
index 73d1e9ac1cf..2777371a8c0 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt
@@ -52,7 +52,7 @@ class InlayScratchFileRenderer(val text: String, private val outputType: Scratch
     }
 
     override fun toString(): String {
-        return "${outputType.name}: ${text.trim()}"
+        return "${text.takeWhile { it.isWhitespace() }}${outputType.name}: ${text.trim()}"
     }
 
     companion object {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt.172 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt.172
index 1480041ebde..503add61910 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt.172
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt.172
@@ -52,7 +52,7 @@ class InlayScratchFileRenderer(val text: String, private val outputType: Scratch
     }
 
     override fun toString(): String {
-        return "${outputType.name}: ${text.trim()}"
+        return "${text.takeWhile { it.isWhitespace() }}${outputType.name}: ${text.trim()}"
     }
 
     companion object {
diff --git a/idea/testData/scratch/generics.comp.after b/idea/testData/scratch/generics.comp.after
index 992dcb85498..ece0a3efe34 100644
--- a/idea/testData/scratch/generics.comp.after
+++ b/idea/testData/scratch/generics.comp.after
@@ -1,8 +1,8 @@
-class GClass<T> {    // RESULT: class GClass<T>
+class GClass<T> {         // RESULT: class GClass<T>
     fun foo(t: T): T {
         return t
     }
 }
 
-val g = GClass<Int>()    // RESULT: val g: Generics.GClass<Int>
-g.foo(1)    // RESULT: 1
+val g = GClass<Int>()     // RESULT: val g: Generics.GClass<Int>
+g.foo(1)                  // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/generics.repl.after b/idea/testData/scratch/generics.repl.after
index 458340348a2..be6807c321a 100644
--- a/idea/testData/scratch/generics.repl.after
+++ b/idea/testData/scratch/generics.repl.after
@@ -5,4 +5,4 @@ class GClass<T> {
 }
 
 val g = GClass<Int>()
-g.foo(1)    // RESULT: 1
+g.foo(1)                  // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/klass.comp.after b/idea/testData/scratch/klass.comp.after
index 4c0cce5fc74..7fbd0a5e799 100644
--- a/idea/testData/scratch/klass.comp.after
+++ b/idea/testData/scratch/klass.comp.after
@@ -1,14 +1,14 @@
-class MyClass {    // RESULT: class MyClass
+class MyClass {                    // RESULT: class MyClass
     fun foo() = 1
 }
 
-MyClass().foo()    // RESULT: 1
+MyClass().foo()                    // RESULT: 1
 
-interface I {    // RESULT: interface I
+interface I {                      // RESULT: interface I
     fun foo(): Int
 }
 
-val i = object: I {    // RESULT: val i: Klass.I
+val i = object: I {                // RESULT: val i: Klass.I
     override fun foo(): Int = 1
 }
-i.foo()    // RESULT: 1
+i.foo()                            // RESULT: 1
diff --git a/idea/testData/scratch/klass.repl.after b/idea/testData/scratch/klass.repl.after
index 978e2377824..b2a75a59f58 100644
--- a/idea/testData/scratch/klass.repl.after
+++ b/idea/testData/scratch/klass.repl.after
@@ -2,7 +2,7 @@ class MyClass {
     fun foo() = 1
 }
 
-MyClass().foo()    // RESULT: 1
+MyClass().foo()                    // RESULT: 1
 
 interface I {
     fun foo(): Int
@@ -11,4 +11,4 @@ interface I {
 val i = object: I {
     override fun foo(): Int = 1
 }
-i.foo()    // RESULT: 1
+i.foo()                            // RESULT: 1
diff --git a/idea/testData/scratch/multiFile/inlineFun/inlineFun.comp.after b/idea/testData/scratch/multiFile/inlineFun/inlineFun.comp.after
index ce195685d49..453b26566b7 100644
--- a/idea/testData/scratch/multiFile/inlineFun/inlineFun.comp.after
+++ b/idea/testData/scratch/multiFile/inlineFun/inlineFun.comp.after
@@ -1,3 +1,3 @@
 import inlineFun.*
 
-foo { 1 + 3 }    // RESULT: 4
\ No newline at end of file
+foo { 1 + 3 }         // RESULT: 4
\ No newline at end of file
diff --git a/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after b/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
index ce195685d49..453b26566b7 100644
--- a/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
+++ b/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
@@ -1,3 +1,3 @@
 import inlineFun.*
 
-foo { 1 + 3 }    // RESULT: 4
\ No newline at end of file
+foo { 1 + 3 }         // RESULT: 4
\ No newline at end of file
diff --git a/idea/testData/scratch/multiFile/javaDep/javaDep.comp.after b/idea/testData/scratch/multiFile/javaDep/javaDep.comp.after
index 03c7977c6c4..0f224476ec7 100644
--- a/idea/testData/scratch/multiFile/javaDep/javaDep.comp.after
+++ b/idea/testData/scratch/multiFile/javaDep/javaDep.comp.after
@@ -1,3 +1,3 @@
 import myTest.MyJavaClass
 
-MyJavaClass().test()    // RESULT: 1
\ No newline at end of file
+MyJavaClass().test()         // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after b/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
index 03c7977c6c4..0f224476ec7 100644
--- a/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
+++ b/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
@@ -1,3 +1,3 @@
 import myTest.MyJavaClass
 
-MyJavaClass().test()    // RESULT: 1
\ No newline at end of file
+MyJavaClass().test()         // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/simple.comp.after b/idea/testData/scratch/simple.comp.after
index fbd154b1c57..08fccb10480 100644
--- a/idea/testData/scratch/simple.comp.after
+++ b/idea/testData/scratch/simple.comp.after
@@ -1,2 +1,2 @@
 val a = 1    // RESULT: val a: Int
-a    // RESULT: 1
+a            // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/simple.repl.after b/idea/testData/scratch/simple.repl.after
index 0ffc50ba557..607c3daa309 100644
--- a/idea/testData/scratch/simple.repl.after
+++ b/idea/testData/scratch/simple.repl.after
@@ -1,2 +1,2 @@
 val a = 1
-a    // RESULT: 1
+a            // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/simpleFun.comp.after b/idea/testData/scratch/simpleFun.comp.after
index 2aee84a673d..80c0e4381d7 100644
--- a/idea/testData/scratch/simpleFun.comp.after
+++ b/idea/testData/scratch/simpleFun.comp.after
@@ -2,4 +2,4 @@ fun foo(): Int {    // RESULT: fun foo(): Int
     return 1
 }
 
-foo()    // RESULT: 1
+foo()               // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/simpleFun.repl.after b/idea/testData/scratch/simpleFun.repl.after
index 56b3a2ca52a..d1eefa1f707 100644
--- a/idea/testData/scratch/simpleFun.repl.after
+++ b/idea/testData/scratch/simpleFun.repl.after
@@ -2,4 +2,4 @@ fun foo(): Int {
     return 1
 }
 
-foo()    // RESULT: 1
+foo()               // RESULT: 1
\ No newline at end of file
diff --git a/idea/testData/scratch/unresolvedMultiline.comp.after b/idea/testData/scratch/unresolvedMultiline.comp.after
index 0e8ad49ce20..e8407a351b1 100644
--- a/idea/testData/scratch/unresolvedMultiline.comp.after
+++ b/idea/testData/scratch/unresolvedMultiline.comp.after
@@ -1,4 +1,4 @@
-foo.forEach {    // ERROR: Unresolved reference: foo; Cannot choose among the following candidates wi...
+foo.forEach {           // ERROR: Unresolved reference: foo; Cannot choose among the following candidates wi...
     1 + 1
 }
 
diff --git a/idea/testData/scratch/unresolvedMultiline.repl.after b/idea/testData/scratch/unresolvedMultiline.repl.after
index e1c465e67a8..a734926f6d7 100644
--- a/idea/testData/scratch/unresolvedMultiline.repl.after
+++ b/idea/testData/scratch/unresolvedMultiline.repl.after
@@ -1,4 +1,4 @@
-foo.forEach {    // ERROR: error: unresolved reference: foo
+foo.forEach {           // ERROR: error: unresolved reference: foo
     1 + 1
 }
 
diff --git a/idea/testData/scratch/var.comp.after b/idea/testData/scratch/var.comp.after
index 2d45cf954c4..f76592d687f 100644
--- a/idea/testData/scratch/var.comp.after
+++ b/idea/testData/scratch/var.comp.after
@@ -1,3 +1,3 @@
 var a = 1    // RESULT: var a: Int
-a++    // RESULT: 1
-a    // RESULT: 2
+a++          // RESULT: 1
+a            // RESULT: 2
\ No newline at end of file
diff --git a/idea/testData/scratch/var.repl.after b/idea/testData/scratch/var.repl.after
index 8300ee454f8..fa801c0bb3d 100644
--- a/idea/testData/scratch/var.repl.after
+++ b/idea/testData/scratch/var.repl.after
@@ -1,3 +1,3 @@
 var a = 1
-a++    // RESULT: 1
-a    // RESULT: 2
+a++          // RESULT: 1
+a            // RESULT: 2
\ No newline at end of file
diff --git a/idea/testData/scratch/veryLongOutput.comp.after b/idea/testData/scratch/veryLongOutput.comp.after
index 929c9cf2682..d491b5fc7b2 100644
--- a/idea/testData/scratch/veryLongOutput.comp.after
+++ b/idea/testData/scratch/veryLongOutput.comp.after
@@ -1,2 +1,2 @@
 val a = "a".repeat(100)    // RESULT: val a: String
-a    // RESULT: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
+a                          // RESULT: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
\ No newline at end of file
diff --git a/idea/testData/scratch/veryLongOutput.repl.after b/idea/testData/scratch/veryLongOutput.repl.after
index 9de292f046c..44e0caadc15 100644
--- a/idea/testData/scratch/veryLongOutput.repl.after
+++ b/idea/testData/scratch/veryLongOutput.repl.after
@@ -1,2 +1,2 @@
 val a = "a".repeat(100)
-a    // RESULT: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
+a                          // RESULT: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...
\ No newline at end of file
diff --git a/idea/testData/scratch/when.comp.after b/idea/testData/scratch/when.comp.after
index bd4a5b18c0f..5c79a6637d7 100644
--- a/idea/testData/scratch/when.comp.after
+++ b/idea/testData/scratch/when.comp.after
@@ -1,19 +1,19 @@
-val a = 1    // RESULT: val a: Int
-when(a) {    // OUTPUT: 1
+val a = 1                   // RESULT: val a: Int
+when(a) {                   // OUTPUT: 1
     1 -> println("1")
     else -> println("2")
 }
 
-when(a) {    // OUTPUT: 1
+when(a) {                   // OUTPUT: 1
     1 -> println("1")
 }
 
-when(a) {    // OUTPUT: 1
+when(a) {                   // OUTPUT: 1
     2 -> println("2")
     else -> println("1")
 }
 
-when(a) {    // RESULT: 11
+when(a) {                   // RESULT: 11
     1 -> 11
     else -> 12
 }
\ No newline at end of file
diff --git a/idea/testData/scratch/when.repl.after b/idea/testData/scratch/when.repl.after
index bc920f19830..14c64c81c2a 100644
--- a/idea/testData/scratch/when.repl.after
+++ b/idea/testData/scratch/when.repl.after
@@ -1,14 +1,14 @@
 val a = 1
-when(a) {    // OUTPUT: 1
+when(a) {                   // OUTPUT: 1
     1 -> println("1")
     else -> println("2")
 }
 
-when(a) {    // OUTPUT: 1
+when(a) {                   // OUTPUT: 1
     1 -> println("1")
 }
 
-when(a) {    // OUTPUT: 1
+when(a) {                   // OUTPUT: 1
     2 -> println("2")
     else -> println("1")
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
index 03a3a551056..108baa9004d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
@@ -132,7 +132,7 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() {
                 .filterIsInstance<InlayScratchFileRenderer>()
                 .forEach {
                     val str = it.toString()
-                    val offset = doc.getLineEndOffset(line); actualOutput.insert(offset, "    // $str")
+                    val offset = doc.getLineEndOffset(line); actualOutput.insert(offset, "${str.takeWhile { it.isWhitespace() }}// ${str.trim()}")
                 }
         }