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

extract method to be used by Upsource

Browse Source
This commit is contained in:
pasynkov
2015-10-06 11:07:21 +02:00
parent be79b267e3
commit a6d7bc7f7c
1 changed files with 10 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
+10 -3
View File
@@ -47,6 +47,14 @@ public class ByWord {
List<InlineChunk> words1 = getInlineChunks(text1);
List<InlineChunk> words2 = getInlineChunks(text2);
return compare(text1, words1, text2, words2, policy, indicator);
}
@NotNull
public static List<DiffFragment> compare(@NotNull CharSequence text1, @NotNull List<InlineChunk> words1,
@NotNull CharSequence text2, @NotNull List<InlineChunk> words2,
@NotNull ComparisonPolicy policy,
@NotNull ProgressIndicator indicator) {
FairDiffIterable wordChanges = diff(words1, words2, indicator);
wordChanges = optimizeWordChunks(text1, text2, words1, words2, wordChanges, indicator);
@@ -601,7 +609,7 @@ public class ByWord {
}
@NotNull
private static List<InlineChunk> getInlineChunks(@NotNull final CharSequence text) {
public static List<InlineChunk> getInlineChunks(@NotNull final CharSequence text) {
final List<InlineChunk> chunks = new ArrayList<InlineChunk>();
final int len = text.length();
@@ -640,9 +648,8 @@ public class ByWord {
// Helpers
//
interface InlineChunk {
public interface InlineChunk {
int getOffset1();
int getOffset2();
}