From 418f1b7aa92e5363156d24c003485f28e2f4534c Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 9 Feb 2017 13:23:44 +0300 Subject: [PATCH] diff: cleanup - rename method --- .../diff-impl/src/com/intellij/diff/comparison/ByWord.java | 4 ++-- .../intellij/diff/comparison/iterables/DiffIterableUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java b/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java index 9de678f25577..9628469c7f47 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java @@ -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 subwords1 = words1.subList(words.start1, words.end1); List 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); diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java b/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java index 6d8ab9dce64e..4858e8dc3a93 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java @@ -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); }