From 70ce590e372b7127be84860841fe0ccecd408f34 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 11 Oct 2017 17:44:17 +0300 Subject: [PATCH] IDEA-140925 diff: do not show modal dialog for diff from command line We use modal dialog to simplify managing of application life cycle, when it is started via ApplicationStarter.main(). If we could find Project, we can rely on default behavior instead. --- .../src/com/intellij/diff/applications/DiffApplication.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java b/platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java index dd73b13af83c..8c61691953bd 100644 --- a/platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java +++ b/platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java @@ -61,6 +61,8 @@ public class DiffApplication extends DiffApplicationBase { else { request = DiffRequestFactory.getInstance().createFromFiles(project, files.get(0), files.get(1)); } - DiffManagerEx.getInstance().showDiffBuiltin(project, request, DiffDialogHints.MODAL); + + DiffDialogHints dialogHints = project != null ? DiffDialogHints.DEFAULT : DiffDialogHints.MODAL; + DiffManagerEx.getInstance().showDiffBuiltin(project, request, dialogHints); } }