Fixed Convert to foreach intention loosing comments

compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt

@@ -646,11 +646,17 @@ public fun JetElement.getCalleeHighlightingRange(): TextRange {
     return TextRange(startOffset, annotationEntry.getCalleeExpression().endOffset)
 }
 
-public val PsiElement.startOffset: Int
-    get() = getTextRange().getStartOffset()
-
-public val PsiElement.endOffset: Int
-    get() = getTextRange().getEndOffset()
+public fun JetBlockExpression.contentRange(): PsiChildRange {
+    val first = (getLBrace()?.getNextSibling() ?: getFirstChild())
+                        ?.siblings(withItself = false)
+                        ?.firstOrNull { it !is PsiWhiteSpace }
+    val rBrace = getRBrace()
+    if (first == rBrace) return PsiChildRange.EMPTY
+    val last = rBrace!!
+            .siblings(forward = false, withItself = false)
+            .first { it !is PsiWhiteSpace }
+    return PsiChildRange(first, last)
+}
 
 // Annotations on labeled expression lies on it's base expression
 public fun JetExpression.getAnnotationEntries(): List<JetAnnotationEntry> {

compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.psi.psiUtil
+
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+
+//TODO: move here more functions from jetPsiUtil.kt
+
+public val PsiElement.startOffset: Int
+    get() = getTextRange().getStartOffset()
+
+public val PsiElement.endOffset: Int
+    get() = getTextRange().getEndOffset()
+
+public data class PsiChildRange(public val first: PsiElement?, public val last: PsiElement?) : Sequence<PsiElement> {
+    init {
+        if (first == null) {
+            assert(last == null)
+        }
+        else {
+            assert(first.getParent() == last!!.getParent())
+        }
+    }
+
+    public val isEmpty: Boolean
+        get() = first == null
+
+    override fun iterator(): Iterator<PsiElement> {
+        val sequence = if (first == null) {
+            emptySequence<PsiElement>()
+        }
+        else {
+            val afterLast = last!!.getNextSibling()
+            first.siblings().takeWhile { it != afterLast }
+        }
+        return sequence.iterator()
+    }
+
+    companion object {
+        public val EMPTY: PsiChildRange = PsiChildRange(null, null)
+    }
+}
+
+public val PsiElement.allChildren: PsiChildRange
+    get() {
+        val first = getFirstChild()
+        return if (first != null) PsiChildRange(first, getLastChild()) else PsiChildRange.EMPTY
+    }
+
+public val PsiChildRange.textRange: TextRange?
+    get() {
+        if (isEmpty) return null
+        return TextRange(first!!.startOffset, last!!.endOffset)
+    }
+
+public fun PsiChildRange.getText(): String {
+    if (isEmpty) return ""
+    return this.map { it.getText() }.joinToString("")
+}
+