From 21d27d93400552c536b6d4069b3e75842e6ae5b2 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 6 Oct 2015 20:06:59 +0300 Subject: [PATCH] Change Signature: Show conflict dialog in silent mode --- .../changeSignature/JetChangeSignatureProcessor.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt index aade7a0a4fe..8df01e3db65 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt @@ -77,13 +77,11 @@ public class JetChangeSignatureProcessor(project: Project, throw BaseRefactoringProcessor.ConflictsInTestsException(conflictDescriptions.values()) } - myPrepareSuccessfulSwingThreadCallback?.let { - val dialog = prepareConflictsDialog(conflictDescriptions, usages) - dialog.show() - if (!dialog.isOK()) { - if (dialog.isShowConflicts()) prepareSuccessful() - return false - } + val dialog = prepareConflictsDialog(conflictDescriptions, usages) + dialog.show() + if (!dialog.isOK()) { + if (dialog.isShowConflicts()) prepareSuccessful() + return false } }