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

Change Signature: Show conflict dialog in silent mode

Browse Source
This commit is contained in:
Alexey Sedunov
2015-10-06 20:06:59 +03:00
parent 9e8600e52f
commit 21d27d9340
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt
+5 -7
View File
@@ -77,13 +77,11 @@ public class JetChangeSignatureProcessor(project: Project,
throw BaseRefactoringProcessor.ConflictsInTestsException(conflictDescriptions.values()) throw BaseRefactoringProcessor.ConflictsInTestsException(conflictDescriptions.values())
} }
myPrepareSuccessfulSwingThreadCallback?.let { val dialog = prepareConflictsDialog(conflictDescriptions, usages)
val dialog = prepareConflictsDialog(conflictDescriptions, usages) dialog.show()
dialog.show() if (!dialog.isOK()) {
if (!dialog.isOK()) { if (dialog.isShowConflicts()) prepareSuccessful()
if (dialog.isShowConflicts()) prepareSuccessful() return false
return false
}
} }
} }