azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ConvertForEachToForLoopIntention preserves comments

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-26 00:17:34 +03:00
parent 5d0b42ee71
commit fefa12b0a9
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt
+7 -2
View File
@@ -18,9 +18,9 @@ package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.CommentSaver
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
@@ -37,8 +37,13 @@ public class ConvertForEachToForLoopIntention : JetSelfTargetingOffsetIndependen
override fun applyTo(element: JetSimpleNameExpression, editor: Editor) {
val (expressionToReplace, receiver, functionLiteral) = extractData(element)!!
val commentSaver = CommentSaver(expressionToReplace)
val loop = generateLoop(functionLiteral, receiver)
expressionToReplace.replace(loop)
val result = expressionToReplace.replace(loop)
commentSaver.restoreComments(result)
}
private data class Data(