MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin extract method] KTIJ-21622: revert editor when template is cancelled by Esc

Browse Source 
GitOrigin-RevId: 9b5bd2e4699504d19f6c58b762530f761efecccb
This commit is contained in:
Alexandr Suhinin
2022-04-26 04:59:38 +00:00
committed by intellij-monorepo-bot
parent 2a213b09e4
commit afffd41f03
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceMethodExtractor.kt
-5
View File
@@ -183,12 +183,7 @@ class InplaceMethodExtractor(private val editor: Editor,
}
private fun afterTemplateStart(templateState: TemplateState) {
//TODO fix undo after change make static
templateState.addTemplateStateListener(object: TemplateEditingAdapter() {
override fun templateCancelled(template: Template?) {
revertState()
}
override fun templateFinished(template: Template, brokenOff: Boolean) {
if (brokenOff) {
revertState()
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+12
View File
@@ -2,6 +2,8 @@
package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction
import com.intellij.codeInsight.template.Template
import com.intellij.codeInsight.template.TemplateEditingAdapter
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable
@@ -13,6 +15,7 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.RefactoringActionHandler
import com.intellij.refactoring.extractMethod.newImpl.inplace.EditorState
import com.intellij.refactoring.extractMethod.newImpl.inplace.ExtractMethodTemplate
import com.intellij.refactoring.extractMethod.newImpl.inplace.InplaceExtractUtils
import org.jetbrains.annotations.Nls
@@ -75,6 +78,7 @@ class ExtractKotlinFunctionHandler(
}) { extractionData ->
val callRange = editor.document.createRangeMarker(elements.first().textRange.startOffset, elements.last().textRange.endOffset)
.apply { isGreedyToLeft = true; isGreedyToRight = true }
val editorState = EditorState(editor)
ExtractionEngine(helper).run(editor, extractionData) { extraction ->
if (isInplaceRefactoringEnabled) {
val callIdentifier = findSingleCallExpression(file, callRange.range)?.calleeExpression ?: throw IllegalStateException()
@@ -83,8 +87,16 @@ class ExtractKotlinFunctionHandler(
val callOffset = callIdentifier.textRange.endOffset
val preview = InplaceExtractUtils.createPreview(editor, methodRange, methodOffset, callRange.range!!, callOffset)
val templateState = ExtractMethodTemplate(editor, extraction.declaration, callIdentifier).runTemplate(LinkedHashSet())
templateState.properties.put("ExtractMethod", true)
callRange.dispose()
Disposer.register(templateState, preview)
templateState.addTemplateStateListener(object: TemplateEditingAdapter() {
override fun templateFinished(template: Template, brokenOff: Boolean) {
if (brokenOff) {
editorState.revert()
}
}
})
InplaceExtractUtils.addTemplateFinishedListener(templateState) {
processDuplicates(extraction.duplicateReplacers, file.project, editor)
}