From 22835471b04e8af9bd8d32f337c07d22b09e2841 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 3 Mar 2015 19:22:28 +0300 Subject: [PATCH] diff: fix typo we should use all editors here, not NotNull ones --- .../diff/tools/util/threeside/ThreesideTextDiffViewer.java | 2 +- .../intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java index d6f3d6ce6110..c6eba704a1bb 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java @@ -508,7 +508,7 @@ public abstract class ThreesideTextDiffViewer extends TextDiffViewerBase { if (myScrollToLine == null) return false; ThreeSide side = myScrollToLine.first; Integer line = myScrollToLine.second; - if (side.select(getEditors()) == null) return false; + if (side.select(myEditors) == null) return false; myCurrentSide = side; DiffUtil.scrollEditor(getCurrentEditor(), line); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java index 450a0498345b..971482b0bb59 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java @@ -541,7 +541,7 @@ public abstract class TwosideTextDiffViewer extends TextDiffViewerBase { if (myScrollToLine == null) return false; Side side = myScrollToLine.first; Integer line = myScrollToLine.second; - if (side.select(getEditors()) == null) return false; + if (side.select(myEditor1, myEditor2) == null) return false; myCurrentSide = side; DiffUtil.scrollEditor(getCurrentEditor(), line);