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: cleanup - rename method

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-02-09 13:30:16 +03:00
parent e13b2437e0
commit 418f1b7aa9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java
+2 -2
View File
@@ -37,7 +37,7 @@ import static com.intellij.diff.comparison.ComparisonManagerImpl.convertIntoMerg
import static com.intellij.diff.comparison.TrimUtil.*;
import static com.intellij.diff.comparison.TrimUtil.trim;
import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*;
import static com.intellij.diff.comparison.iterables.DiffIterableUtil.trim;
import static com.intellij.diff.comparison.iterables.DiffIterableUtil.subiterable;
import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace;
public class ByWord {
@@ -137,7 +137,7 @@ public class ByWord {
List<InlineChunk> subwords1 = words1.subList(words.start1, words.end1);
List<InlineChunk> subwords2 = words2.subList(words.start2, words.end2);
FairDiffIterable subiterable = fair(trim(wordChanges, words.start1, words.end1, words.start2, words.end2));
FairDiffIterable subiterable = fair(subiterable(wordChanges, words.start1, words.end1, words.start2, words.end2));
FairDiffIterable delimitersIterable = matchAdjustmentDelimiters(subtext1, subtext2, subwords1, subwords2, subiterable,
offsets.start1, offsets.start2, indicator);
platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java
+1 -1
View File
@@ -135,7 +135,7 @@ public class DiffIterableUtil {
}
@NotNull
public static DiffIterable trim(@NotNull DiffIterable iterable, int start1, int end1, int start2, int end2) {
public static DiffIterable subiterable(@NotNull DiffIterable iterable, int start1, int end1, int start2, int end2) {
return new SubiterableDiffIterable(iterable, start1, end1, start2, end2);
}