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

lst: fix inner ranges computatuion

Browse Source 
we can't trim changes here, because inner ranges would not be updated

this fix causes regression - trimmable ranges (ex: " \nX\n" vs "")
This commit is contained in:
Aleksey Pivovarov
2016-07-13 22:04:06 +03:00
committed by Aleksey Pivovarov
parent 7b12f38687
commit db77b2b459
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java
+1 -2
View File
@@ -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;