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

diff: use separate settings for diff as external tool

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-03-01 22:19:47 +03:00
parent 0e364a7554
commit 95c33a4be2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java
+7 -1
View File
@@ -18,7 +18,10 @@ package com.intellij.diff.applications;
import com.intellij.diff.DiffDialogHints;
import com.intellij.diff.DiffManagerEx;
import com.intellij.diff.DiffRequestFactory;
import com.intellij.diff.chains.SimpleDiffRequestChain;
import com.intellij.diff.requests.DiffRequest;
import com.intellij.diff.util.DiffPlaces;
import com.intellij.diff.util.DiffUserDataKeys;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.project.Project;
@@ -62,7 +65,10 @@ public class DiffApplication extends DiffApplicationBase {
request = DiffRequestFactory.getInstance().createFromFiles(project, files.get(0), files.get(1));
}
SimpleDiffRequestChain chain = new SimpleDiffRequestChain(request);
chain.putUserData(DiffUserDataKeys.PLACE, DiffPlaces.EXTERNAL);
DiffDialogHints dialogHints = project != null ? DiffDialogHints.DEFAULT : DiffDialogHints.MODAL;
DiffManagerEx.getInstance().showDiffBuiltin(project, request, dialogHints);
DiffManagerEx.getInstance().showDiffBuiltin(project, chain, dialogHints);
}
}
platform/diff-impl/src/com/intellij/diff/util/DiffPlaces.java
+1
View File
@@ -22,4 +22,5 @@ public interface DiffPlaces {
String TESTS_FAILED_ASSERTIONS = "TestsFiledAssertions";
String MERGE = "Merge";
String DIR_DIFF = "DirDiff";
String EXTERNAL = "External";
}