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: apply highlighting to both diffViewers, not only the current one

Browse Source
This commit is contained in:
Aleksey Pivovarov
2014-07-08 15:52:03 +04:00
parent ba1fb92529
commit 2f534a506a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
+8 -5
View File
@@ -171,7 +171,8 @@ public class ChangesFragmentedDiffPanel implements Disposable {
descriptor = new OpenFileDescriptor(myProject, myFragmentedContent.getFile(), converted, position.column);
} else {
if (((DiffPanelImpl) panel).getEditor1().getDocument().getTextLength() == 0) {
FileEditorManager.getInstance(myProject).openTextEditor(new OpenFileDescriptor(myProject, myFragmentedContent.getFile(), 0), true);
FileEditorManager.getInstance(myProject).openTextEditor(new OpenFileDescriptor(myProject, myFragmentedContent.getFile(), 0),
true);
return;
}
@@ -281,11 +282,13 @@ public class ChangesFragmentedDiffPanel implements Disposable {
FragmentedEditorHighlighter bh = fragmentedContent.getBeforeHighlighter();
if (bh != null) {
((EditorEx) ((DiffPanelImpl) currentPanel).getEditor1()).setHighlighter(bh);
((EditorEx) ((DiffPanelImpl) myHorizontal).getEditor1()).setHighlighter(bh);
((EditorEx) ((DiffPanelImpl) myVertical).getEditor1()).setHighlighter(bh);
}
FragmentedEditorHighlighter ah = fragmentedContent.getAfterHighlighter();
if (ah != null) {
((EditorEx) ((DiffPanelImpl) currentPanel).getEditor2()).setHighlighter(ah);
((EditorEx) ((DiffPanelImpl) myHorizontal).getEditor2()).setHighlighter(ah);
((EditorEx) ((DiffPanelImpl) myVertical).getEditor2()).setHighlighter(ah);
}
if (((DiffPanelImpl) currentPanel).getEditor1() != null) {
highlightTodo(true, fragmentedContent.getBeforeTodoRanges());
@@ -403,7 +406,7 @@ public class ChangesFragmentedDiffPanel implements Disposable {
}
private static final Icon ourIcon = PlatformIcons.CHECK_ICON;
private class PopupAction extends DumbAwareAction {
private final AnAction myUsual;
private final AnAction myNumbered;
@@ -680,7 +683,7 @@ public class ChangesFragmentedDiffPanel implements Disposable {
private class MyNextDiffAction extends DumbAwareAction {
private boolean myEnabled;
private MyNextDiffAction() {
super("Next Change", "Next Change", AllIcons.Actions.NextOccurence);
}