From d1d4736fddadb3b47216a4cadc612eb2bfa82981 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 16 Jun 2015 14:28:52 +0300 Subject: [PATCH] Create from Usage: Do not navigate to original file if template editing is cancelled #KT-8037 Fixed --- .../createFromUsage/callableBuilder/CallableBuilder.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index c1d2e92a1ad..23e4eeeae71 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -1013,10 +1013,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { PsiDocumentManager.getInstance(project).commitDocument(containingFileEditor.getDocument()) dialogWithEditor?.close(DialogWrapper.OK_EXIT_CODE) - if (brokenOff && !ApplicationManager.getApplication().isUnitTestMode()) { - NavigationUtil.activateFileWithPsiElement(config.originalElement) - return - } + if (brokenOff && !ApplicationManager.getApplication().isUnitTestMode()) return // file templates val newDeclaration = if (templateImpl.getSegmentsCount() > 0) {