From db77b2b45971e9592e86f71c2da97550d6b39392 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 13 Jul 2016 21:08:41 +0300 Subject: [PATCH] lst: fix inner ranges computatuion we can't trim changes here, because inner ranges would not be updated this fix causes regression - trimmable ranges (ex: " \nX\n" vs "") --- .../src/com/intellij/openapi/vcs/ex/RangesBuilder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java index 3f12ec58f470..08a804f116ec 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java @@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.ex; import com.intellij.diff.comparison.ByLine; import com.intellij.diff.comparison.ComparisonPolicy; import com.intellij.diff.comparison.TrimUtil; +import com.intellij.diff.comparison.iterables.DiffIterable; import com.intellij.diff.comparison.iterables.DiffIterableUtil; import com.intellij.diff.comparison.iterables.FairDiffIterable; import com.intellij.diff.util.DiffUtil; @@ -146,8 +147,6 @@ public class RangesBuilder { } innerRanges.trimToSize(); - change = TrimUtil.expand(myVcs, myCurrent, change.start1, change.start2, change.end1, change.end2); - int currentLine1 = myCurrentShift + change.start2; int currentLine2 = myCurrentShift + change.end2; int vcsLine1 = myVcsShift + change.start1;