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: fix annotations if DiffViewerWrapper is used

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-09-03 19:28:12 +03:00
parent cacbcab8dc
commit d28eab0d13
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+5 -6
View File
@@ -50,11 +50,7 @@ import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.util.*;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.HintHint;
import com.intellij.ui.JBColor;
import com.intellij.ui.JBProgressBar;
import com.intellij.ui.LightweightHint;
import com.intellij.ui.*;
import com.intellij.ui.components.panels.Wrapper;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.JBUI;
@@ -1216,9 +1212,12 @@ public abstract class DiffRequestProcessor implements Disposable {
@Nullable
@Override
public Object getData(@NonNls String dataId) {
if (DiffDataKeys.DIFF_VIEWER.is(dataId)) {
if (DiffDataKeys.WRAPPING_DIFF_VIEWER.is(dataId)) {
return myWrapperViewer;
}
if (DiffDataKeys.DIFF_VIEWER.is(dataId)) {
return myViewer;
}
return null;
}
}
platform/diff-impl/src/com/intellij/diff/tools/util/DiffDataKeys.java
+1 -1
View File
@@ -19,7 +19,6 @@ import com.intellij.diff.DiffContext;
import com.intellij.diff.FrameDiffTool;
import com.intellij.diff.contents.DiffContent;
import com.intellij.diff.requests.DiffRequest;
import com.intellij.diff.util.IntPair;
import com.intellij.diff.util.LineRange;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.editor.Editor;
@@ -33,6 +32,7 @@ public interface DiffDataKeys {
DataKey<DiffRequest> DIFF_REQUEST = DataKey.create("diff_request");
DataKey<DiffContext> DIFF_CONTEXT = DataKey.create("diff_context");
DataKey<FrameDiffTool.DiffViewer> DIFF_VIEWER = DataKey.create("diff_frame_viewer");
DataKey<FrameDiffTool.DiffViewer> WRAPPING_DIFF_VIEWER = DataKey.create("main_diff_frame_viewer"); // if DiffViewerWrapper is used
DataKey<OpenFileDescriptor> OPEN_FILE_DESCRIPTOR = DataKey.create("diff_open_file_descriptor");
DataKey<PrevNextDifferenceIterable> PREV_NEXT_DIFFERENCE_ITERABLE = DataKey.create("prev_next_difference_iterable");