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

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-09-16 14:34:23 +03:00
parent 5cce61160d
commit 111be994e1
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/comparison/LineFragmentSplitter.java
+14 -14
View File
@@ -135,6 +135,12 @@ class LineFragmentSplitter {
return false;
}
@NotNull
private static WordBlock mergeBlocks(@NotNull WordBlock start, @NotNull WordBlock end) {
return new WordBlock(new Range(start.words.start1, end.words.end1, start.words.start2, end.words.end2),
new Range(start.offsets.start1, end.offsets.end1, start.offsets.start2, end.offsets.end2));
}
private boolean isEqualsIgnoreWhitespace(@NotNull WordBlock block) {
CharSequence sequence1 = myText1.subSequence(block.offsets.start1, block.offsets.end1);
CharSequence sequence2 = myText2.subSequence(block.offsets.start2, block.offsets.end2);
@@ -142,10 +148,14 @@ class LineFragmentSplitter {
return StringUtil.equalsIgnoreWhitespaces(sequence1, sequence2);
}
@NotNull
private static WordBlock mergeBlocks(@NotNull WordBlock start, @NotNull WordBlock end) {
return new WordBlock(new Range(start.words.start1, end.words.end1, start.words.start2, end.words.end2),
new Range(start.offsets.start1, end.offsets.end1, start.offsets.start2, end.offsets.end2));
private boolean noWordsInside(@NotNull WordBlock block) {
for (int i = block.words.start1; i < block.words.end1; i++) {
if (!(myWords1.get(i) instanceof NewlineChunk)) return false;
}
for (int i = block.words.start2; i < block.words.end2; i++) {
if (!(myWords2.get(i) instanceof NewlineChunk)) return false;
}
return true;
}
private static int getOffset(@NotNull List<InlineChunk> words, @NotNull CharSequence text, int index) {
@@ -165,16 +175,6 @@ class LineFragmentSplitter {
return words1.get(index - 1) instanceof NewlineChunk;
}
private boolean noWordsInside(@NotNull WordBlock block) {
for (int i = block.words.start1; i < block.words.end1; i++) {
if (!(myWords1.get(i) instanceof NewlineChunk)) return false;
}
for (int i = block.words.start2; i < block.words.end2; i++) {
if (!(myWords2.get(i) instanceof NewlineChunk)) return false;
}
return true;
}
//
// Helpers
//