diff --git a/idea/testData/resolve/partialBodyResolve/As.dump b/idea/testData/resolve/partialBodyResolve/As.dump
index c4a613d7c49..42ef4d5d47b 100644
--- a/idea/testData/resolve/partialBodyResolve/As.dump
+++ b/idea/testData/resolve/partialBodyResolve/As.dump
@@ -2,8 +2,8 @@ Resolve target: value-parameter val p: kotlin.Any smart-cast to kotlin.String
 ----------------------------------------------
 fun foo(p: Any, p1: Any?) {
     x(e.f as String)
-    // STATEMENT DELETED: y(p as? Int)
-    // STATEMENT DELETED: z(f() as String)
+    /* STATEMENT DELETED: y(p as? Int) */
+    /* STATEMENT DELETED: z(f() as String) */
 
     if (a) {
         print((p as String).size)
@@ -14,8 +14,8 @@ fun foo(p: Any, p1: Any?) {
 
     if (y()) {
         print(<caret>p.size)
-        // STATEMENT DELETED: p1 as String
+        /* STATEMENT DELETED: p1 as String */
     }
 
-    // STATEMENT DELETED: z(p1 as String)
+    /* STATEMENT DELETED: z(p1 as String) */
 }
diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.dump b/idea/testData/resolve/partialBodyResolve/BangBang.dump
index ac9570246bb..0cb2ad517aa 100644
--- a/idea/testData/resolve/partialBodyResolve/BangBang.dump
+++ b/idea/testData/resolve/partialBodyResolve/BangBang.dump
@@ -2,7 +2,7 @@ Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.Strin
 ----------------------------------------------
 fun foo(p: String?, p1: Any?) {
     x(e.f!!)
-    // STATEMENT DELETED: y(f()!!)
+    /* STATEMENT DELETED: y(f()!!) */
 
     if (a) {
         print(p!!.size)
@@ -13,8 +13,8 @@ fun foo(p: String?, p1: Any?) {
 
     if (y()) {
         print(<caret>p.size)
-        // STATEMENT DELETED: p1!!
+        /* STATEMENT DELETED: p1!! */
     }
 
-    // STATEMENT DELETED: z(p1!!)
+    /* STATEMENT DELETED: z(p1!!) */
 }
diff --git a/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump b/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump
index c94acd4428a..0eda044b04d 100644
--- a/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump
+++ b/idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.dump
@@ -2,7 +2,7 @@ Resolve target: value-parameter val p: kotlin.Boolean? smart-cast to kotlin.Bool
 ----------------------------------------------
 fun foo(p: Boolean?, p1: Any?) {
     if (p!!) {
-        // STATEMENT DELETED: print(p1!!.hashCode())
+        /* STATEMENT DELETED: print(p1!!.hashCode()) */
     }
 
     <caret>p.hashCode()
diff --git a/idea/testData/resolve/partialBodyResolve/DeclarationsBefore.dump b/idea/testData/resolve/partialBodyResolve/DeclarationsBefore.dump
index 9569e371dcf..12b0bad85aa 100644
--- a/idea/testData/resolve/partialBodyResolve/DeclarationsBefore.dump
+++ b/idea/testData/resolve/partialBodyResolve/DeclarationsBefore.dump
@@ -1,7 +1,7 @@
 Resolve target: val v2: kotlin.Int
 ----------------------------------------------
 fun foo(p: Int) {
-    // STATEMENT DELETED: x()
+    /* STATEMENT DELETED: x() */
 
     val v1 = p * p
 
@@ -9,12 +9,12 @@ fun foo(p: Int) {
         val v2 = v1 * v1
         val v3 = v1 * v2
 
-        // STATEMENT DELETED: run { val v2 = 1 println(v2) }
+        /* STATEMENT DELETED: run { val v2 = 1 println(v2) } */
 
         print(<caret>v2)
 
-        // STATEMENT DELETED: run { val v2 = 2 println(v2) }
+        /* STATEMENT DELETED: run { val v2 = 2 println(v2) } */
     }
 
-    // STATEMENT DELETED: z()
+    /* STATEMENT DELETED: z() */
 }
diff --git a/idea/testData/resolve/partialBodyResolve/ExpressionBodyExplicitType.dump b/idea/testData/resolve/partialBodyResolve/ExpressionBodyExplicitType.dump
index 94e4f2c0be2..297ebd10fc7 100644
--- a/idea/testData/resolve/partialBodyResolve/ExpressionBodyExplicitType.dump
+++ b/idea/testData/resolve/partialBodyResolve/ExpressionBodyExplicitType.dump
@@ -1,8 +1,8 @@
 Resolve target: val v: kotlin.Int
 ----------------------------------------------
 fun foo(): String = run {
-    // STATEMENT DELETED: print("a")
+    /* STATEMENT DELETED: print("a") */
     val v = 1
     print(<caret>v)
     "x"
-}
\ No newline at end of file
+}
diff --git a/idea/testData/resolve/partialBodyResolve/For1.dump b/idea/testData/resolve/partialBodyResolve/For1.dump
index c4ff762235a..4d2ea109278 100644
--- a/idea/testData/resolve/partialBodyResolve/For1.dump
+++ b/idea/testData/resolve/partialBodyResolve/For1.dump
@@ -1,7 +1,7 @@
 Resolve target: null
 ----------------------------------------------
 fun foo(p: Any?, c: Collection<String>) {
-    // STATEMENT DELETED: for (e in c) { print(p!!) }
+    /* STATEMENT DELETED: for (e in c) { print(p!!) } */
 
     <caret>xxx
 }
diff --git a/idea/testData/resolve/partialBodyResolve/For2.dump b/idea/testData/resolve/partialBodyResolve/For2.dump
index f3338c65083..88ea5c96107 100644
--- a/idea/testData/resolve/partialBodyResolve/For2.dump
+++ b/idea/testData/resolve/partialBodyResolve/For2.dump
@@ -4,7 +4,7 @@ fun x(s: String): Collection<String>{}
 
 fun foo(p: Any?, p1: Any?) {
     for (e in x(p as String)) {
-        // STATEMENT DELETED: print(p1!!)
+        /* STATEMENT DELETED: print(p1!!) */
     }
 
     <caret>p.size
diff --git a/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts.dump b/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts.dump
index c96c893b3a6..a104dc8632b 100644
--- a/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts.dump
@@ -1,7 +1,7 @@
 Resolve target: null
 ----------------------------------------------
 fun foo(p: Any?, p1, Any?) {
-    // STATEMENT DELETED: if (x()) { y(p!!) } else { z(p1!!) }
+    /* STATEMENT DELETED: if (x()) { y(p!!) } else { z(p1!!) } */
 
     <caret>xxx
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump b/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump
index 1ad1b06e8c5..f881c9c08ed 100644
--- a/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.dump
@@ -2,12 +2,12 @@ Resolve target: value-parameter val p1: kotlin.Any? smart-cast to kotlin.Any
 ----------------------------------------------
 fun foo(p: Any?, p1: Any?, p2: Any?) {
     if (x()) {
-        // STATEMENT DELETED: print(p!!)
+        /* STATEMENT DELETED: print(p!!) */
         print(p1!!)
     }
     else {
         print(p1 as String)
-        // STATEMENT DELETED: print(p2!!)
+        /* STATEMENT DELETED: print(p2!!) */
     }
 
     <caret>p1.hashCode()
diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump
index c6124d7fffc..40b94a3caa4 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.dump
@@ -2,6 +2,6 @@ Resolve target: value-parameter val p: kotlin.Any
 ----------------------------------------------
 val error = "error"
 fun foo(p: Any) {
-    // STATEMENT DELETED: if (p !is String) { print(error) }
+    /* STATEMENT DELETED: if (p !is String) { print(error) } */
     println(<caret>p.size)
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump
index f4d78504bd9..fd764d75dca 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump
@@ -3,7 +3,7 @@ Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.String
 fun foo(p: Any?) {
     if (p !is String) {
         if (p == null) {
-            // STATEMENT DELETED: print("null")
+            /* STATEMENT DELETED: print("null") */
             return
         }
         else {
diff --git a/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump
index 7d34a722ca4..eabce4a496f 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.dump
@@ -2,7 +2,7 @@ Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any
 ----------------------------------------------
 fun foo(p: Any?) {
     if (p != null) {
-        // STATEMENT DELETED: print("not null")
+        /* STATEMENT DELETED: print("not null") */
     }
     else {
         return
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump b/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump
index f5226def9c8..ea1563a050b 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.dump
@@ -3,13 +3,13 @@ Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.Strin
 fun foo(p: String?, x: Boolean, y: Boolean, z: Boolean, t: Boolean) {
     if (p == null) {
         if (x) {
-            // STATEMENT DELETED: print("x")
+            /* STATEMENT DELETED: print("x") */
             error("error")
         }
         else if (y) {
-            // STATEMENT DELETED: print("y")
+            /* STATEMENT DELETED: print("y") */
             if (z) {
-                // STATEMENT DELETED: print("z")
+                /* STATEMENT DELETED: print("z") */
                 return
             }
             else {
@@ -18,7 +18,7 @@ fun foo(p: String?, x: Boolean, y: Boolean, z: Boolean, t: Boolean) {
         }
         else {
             if (t) {
-                // STATEMENT DELETED: print("t")
+                /* STATEMENT DELETED: print("t") */
                 return
             }
             else {
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturn.dump
index f7911d55fb7..a1cb152cadc 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturn.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { print(1) if (f()) return }
+        /* STATEMENT DELETED: if (x == null) { print(1) if (f()) return } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturnWithElse.dump b/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturnWithElse.dump
index 3e045a378e4..746785f9548 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturnWithElse.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullConditionalReturnWithElse.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { print(1) if (f()) { return } else { print(2) } }
+        /* STATEMENT DELETED: if (x == null) { print(1) if (f()) { return } else { print(2) } } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullDoWhileWithBreak.dump b/idea/testData/resolve/partialBodyResolve/IfNullDoWhileWithBreak.dump
index 29f218dcfc1..d27aff70a82 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullDoWhileWithBreak.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullDoWhileWithBreak.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { do { if (g()) break } while (f()) }
+        /* STATEMENT DELETED: if (x == null) { do { if (g()) break } while (f()) } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.dump
index 8cbadefe522..134abcaa4d2 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { print(1) val v = f() ?: return }
+        /* STATEMENT DELETED: if (x == null) { print(1) val v = f() ?: return } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullForWithReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullForWithReturn.dump
index bbd380c6a34..8a27c5e3dc9 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullForWithReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullForWithReturn.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo(c: Collection<String>) {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { for (s in c) { print(s) return } }
+        /* STATEMENT DELETED: if (x == null) { for (s in c) { print(s) return } } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump b/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump
index 41fb42795ab..e7ea4ab480f 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullPrint.dump
@@ -1,6 +1,6 @@
 Resolve target: value-parameter val p: kotlin.Any?
 ----------------------------------------------
 fun foo(p: Any?) {
-    // STATEMENT DELETED: if (p == null) { print("null") }
+    /* STATEMENT DELETED: if (p == null) { print("null") } */
     <caret>p.hashCode()
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump
index b3b72159c2a..a29ad9933f3 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullReturn.dump
@@ -2,7 +2,7 @@ Resolve target: value-parameter val p: kotlin.Any? smart-cast to kotlin.Any
 ----------------------------------------------
 fun foo(p: Any?) {
     if (p == null) {
-        // STATEMENT DELETED: print("null")
+        /* STATEMENT DELETED: print("null") */
         return
     }
     <caret>p.hashCode()
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullWhileTrueWithBreak.dump b/idea/testData/resolve/partialBodyResolve/IfNullWhileTrueWithBreak.dump
index e68558d0348..65bd5877f72 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullWhileTrueWithBreak.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullWhileTrueWithBreak.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { while (true) { if (g()) break } }
+        /* STATEMENT DELETED: if (x == null) { while (true) { if (g()) break } } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullWhileWithReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullWhileWithReturn.dump
index 1ed9f5d2450..63ca82ce876 100644
--- a/idea/testData/resolve/partialBodyResolve/IfNullWhileWithReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfNullWhileWithReturn.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { while (f()) { print(1) return } }
+        /* STATEMENT DELETED: if (x == null) { while (f()) { print(1) return } } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/IfReturn.dump b/idea/testData/resolve/partialBodyResolve/IfReturn.dump
index 49c51c7423d..efb48e5d5ef 100644
--- a/idea/testData/resolve/partialBodyResolve/IfReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfReturn.dump
@@ -1,6 +1,6 @@
 Resolve target: val kotlin.String.size: kotlin.Int
 ----------------------------------------------
 fun foo(p: String) {
-    // STATEMENT DELETED: if (x()) return
+    /* STATEMENT DELETED: if (x()) return */
     println(p.<caret>size)
 }
diff --git a/idea/testData/resolve/partialBodyResolve/Lambda.dump b/idea/testData/resolve/partialBodyResolve/Lambda.dump
index 880ea0ec156..74133442e12 100644
--- a/idea/testData/resolve/partialBodyResolve/Lambda.dump
+++ b/idea/testData/resolve/partialBodyResolve/Lambda.dump
@@ -5,6 +5,6 @@ class C {
 }
 
 fun foo() {
-    val lambda = {() -> // STATEMENT DELETED: x(); C() }
+    val lambda = {() -> /* STATEMENT DELETED: x() */; C() }
     lambda().<caret>f()
 }
diff --git a/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump b/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
index 7ecbdfc17f6..3c926ab43e3 100644
--- a/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
+++ b/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
@@ -8,7 +8,7 @@ fun foo(c: Collection<String>): Collection<String> {
             true
         }
         else {
-            // STATEMENT DELETED: println()
+            /* STATEMENT DELETED: println() */
             it[0] == 'a'
         }
     }
diff --git a/idea/testData/resolve/partialBodyResolve/LocalFun.dump b/idea/testData/resolve/partialBodyResolve/LocalFun.dump
index 310f8e19e51..7c3dc20d527 100644
--- a/idea/testData/resolve/partialBodyResolve/LocalFun.dump
+++ b/idea/testData/resolve/partialBodyResolve/LocalFun.dump
@@ -2,9 +2,9 @@ Resolve target: value-parameter val p: kotlin.String?
 ----------------------------------------------
 fun foo(p: String?) {
     fun local(): String? {
-        // STATEMENT DELETED: if (p == null) return null
-        // STATEMENT DELETED: print(p.size)
-        // STATEMENT DELETED: return ""
+        /* STATEMENT DELETED: if (p == null) return null */
+        /* STATEMENT DELETED: print(p.size) */
+        /* STATEMENT DELETED: return "" */
     }
 
     <caret>p?.size
diff --git a/idea/testData/resolve/partialBodyResolve/NestedLoop.dump b/idea/testData/resolve/partialBodyResolve/NestedLoop.dump
index 3238ce9be7e..767fe21a7a5 100644
--- a/idea/testData/resolve/partialBodyResolve/NestedLoop.dump
+++ b/idea/testData/resolve/partialBodyResolve/NestedLoop.dump
@@ -3,7 +3,7 @@ Resolve target: val x: kotlin.Any?
 fun foo() {
     for (i in 1..10) {
         val x = take()
-        // STATEMENT DELETED: if (x == null) { while (true) { do { println() } while(f()) break } }
+        /* STATEMENT DELETED: if (x == null) { while (true) { do { println() } while(f()) break } } */
         <caret>x.hashCode()
     }
 }
diff --git a/idea/testData/resolve/partialBodyResolve/OutOfBodyResolve.dump b/idea/testData/resolve/partialBodyResolve/OutOfBodyResolve.dump
index f80993a870b..a1b235609dd 100644
--- a/idea/testData/resolve/partialBodyResolve/OutOfBodyResolve.dump
+++ b/idea/testData/resolve/partialBodyResolve/OutOfBodyResolve.dump
@@ -3,6 +3,6 @@ Resolve target: val v: kotlin.String
 val v = ""
 
 fun foo(s: String = <caret>v) {
-    // STATEMENT DELETED: val local = 1
-    // STATEMENT DELETED: print("foo" + local)
+    /* STATEMENT DELETED: val local = 1 */
+    /* STATEMENT DELETED: print("foo" + local) */
 }
diff --git a/idea/testData/resolve/partialBodyResolve/PropertyAccessorBody.dump b/idea/testData/resolve/partialBodyResolve/PropertyAccessorBody.dump
index 0295e0e9d6d..8c762f91225 100644
--- a/idea/testData/resolve/partialBodyResolve/PropertyAccessorBody.dump
+++ b/idea/testData/resolve/partialBodyResolve/PropertyAccessorBody.dump
@@ -2,13 +2,13 @@ Resolve target: val v: kotlin.Int
 ----------------------------------------------
 var prop: Int
     get() {
-        // STATEMENT DELETED: print("get")
+        /* STATEMENT DELETED: print("get") */
         val v = 1
         <caret>v
-        // STATEMENT DELETED: return 1
+        /* STATEMENT DELETED: return 1 */
     }
     set {
-        // STATEMENT DELETED: print("set")
-        // STATEMENT DELETED: val v = 2
-        // STATEMENT DELETED: print("yes")
-    }
\ No newline at end of file
+        /* STATEMENT DELETED: print("set") */
+        /* STATEMENT DELETED: val v = 2 */
+        /* STATEMENT DELETED: print("yes") */
+    }
diff --git a/idea/testData/resolve/partialBodyResolve/PropertyByDelegate.dump b/idea/testData/resolve/partialBodyResolve/PropertyByDelegate.dump
index 269b3f9c1ec..d0288afb804 100644
--- a/idea/testData/resolve/partialBodyResolve/PropertyByDelegate.dump
+++ b/idea/testData/resolve/partialBodyResolve/PropertyByDelegate.dump
@@ -3,7 +3,7 @@ Resolve target: fun g(): kotlin.Int
 import kotlin.properties.Delegates
 
 val prop: Int by Delegates.lazy {
-    // STATEMENT DELETED: print(1)
+    /* STATEMENT DELETED: print(1) */
     val v = f()
     <caret>g()
     v + 1
diff --git a/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump b/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump
index 0663bc0b1f5..19ed2ce6dfa 100644
--- a/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump
+++ b/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump
@@ -3,7 +3,7 @@ Resolve target: value-parameter val p: kotlin.String? smart-cast to kotlin.Strin
 fun foo(p: String?): () -> String {
     if (p == null) {
         return {
-            // STATEMENT DELETED: println()
+            /* STATEMENT DELETED: println() */
             "a"
         }
     }
diff --git a/idea/testData/resolve/partialBodyResolve/Simple.dump b/idea/testData/resolve/partialBodyResolve/Simple.dump
index 1f073d2b72a..9bfe2bdd1db 100644
--- a/idea/testData/resolve/partialBodyResolve/Simple.dump
+++ b/idea/testData/resolve/partialBodyResolve/Simple.dump
@@ -1,9 +1,9 @@
 Resolve target: value-parameter val p: kotlin.Int
 ----------------------------------------------
 fun foo(p: Int) {
-    // STATEMENT DELETED: x()
+    /* STATEMENT DELETED: x() */
     if (y()) {
         print(<caret>p)
     }
-    // STATEMENT DELETED: z()
+    /* STATEMENT DELETED: z() */
 }
diff --git a/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump b/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump
index f2ae2fa5187..7ba97984ece 100644
--- a/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump
+++ b/idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.dump
@@ -18,4 +18,4 @@ fun foo(s: String?, b1: Boolean, b2: Boolean) {
     )
 }
 
-fun x(p1: Int, p2: String) { }
\ No newline at end of file
+fun x(p1: Int, p2: String) { }
diff --git a/idea/testData/resolve/partialBodyResolve/While.dump b/idea/testData/resolve/partialBodyResolve/While.dump
index d997927147f..84a71a21a5d 100644
--- a/idea/testData/resolve/partialBodyResolve/While.dump
+++ b/idea/testData/resolve/partialBodyResolve/While.dump
@@ -4,7 +4,7 @@ fun x(s: Any): Boolean{}
 
 fun foo(p: Any?, p1: Any?) {
     while(x(p!!)) {
-        // STATEMENT DELETED: print(p1!!)
+        /* STATEMENT DELETED: print(p1!!) */
     }
 
     <caret>p.hashCode()
diff --git a/idea/testData/resolve/partialBodyResolve/WhileTrue.dump b/idea/testData/resolve/partialBodyResolve/WhileTrue.dump
index c7793acd373..d3500d4b3ef 100644
--- a/idea/testData/resolve/partialBodyResolve/WhileTrue.dump
+++ b/idea/testData/resolve/partialBodyResolve/WhileTrue.dump
@@ -5,7 +5,7 @@ fun x(): Boolean{}
 fun foo(p: Any?) {
     while(true) {
         print(p!!)
-        // STATEMENT DELETED: if (x()) break
+        /* STATEMENT DELETED: if (x()) break */
     }
 
     <caret>p.hashCode()
diff --git a/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump b/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump
index fab457d3ae6..7ef40663035 100644
--- a/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump
+++ b/idea/testData/resolve/partialBodyResolve/WhileTrueCondition.dump
@@ -5,7 +5,7 @@ Resolve target: value-parameter val p: kotlin.Any?
 fun x(): Boolean{}
 
 fun foo(p: Any?) {
-    // STATEMENT DELETED: while(2 * 2 == 4) { print(p!!) if (x()) break }
+    /* STATEMENT DELETED: while(2 * 2 == 4) { print(p!!) if (x()) break } */
 
     <caret>p.hashCode()
 }
diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt
index 2480e3af927..a0e74e80bd0 100644
--- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt
+++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt
@@ -77,7 +77,7 @@ public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtur
                 {
                     ApplicationManager.getApplication().runWriteAction {
                         for (statement in skippedStatements) {
-                            statement.replace(JetPsiFactory(getProject()).createComment("// STATEMENT DELETED: ${statement.compactPresentation()}"))
+                            statement.replace(JetPsiFactory(getProject()).createComment("/* STATEMENT DELETED: ${statement.compactPresentation()} */"))
                         }
                     }
                 },