From 78a686b0e9e0f6c2af22f4815ea088213a4bd640 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 3 Sep 2024 15:15:54 +0200 Subject: [PATCH] EA-1444724 diff: fix assertion in UnifiedImaginaryEditor.calculateVisibleRange GitOrigin-RevId: b727f2e9c3cf22e654bb328ae014af24c1ed2d7e --- .../com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java index 491aeac5d9ea..ac45fac60a76 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java @@ -1654,7 +1654,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase implements EditorD int sideLine1 = lineConvertor.convertApproximate(Math.max(0, line1 - 1)); int sideLine2 = lineConvertor.convertApproximate(Math.min(DiffUtil.getLineCount(oneSideDocument), line2 + 1)); - if (sideLine1 < 0 || sideLine2 < 0 || sideLine1 > sideLine2) { + if (sideLine1 < 0 || sideLine1 > sideLine2 || sideLine2 > DiffUtil.getLineCount(sideDocument)) { return ProperTextRange.create(0, 0); } TextRange sideRange = DiffUtil.getLinesRange(sideDocument, sideLine1, sideLine2, false);