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: do not ignore passed DiffComputer

Browse Source 
follow-up: 765bdf8cbe
This commit is contained in:
Aleksey Pivovarov
2018-03-26 17:59:41 +03:00
parent 7e2cd3de14
commit fbce4f4142
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/util/text/SimpleTextDiffProvider.java
+10 -4
View File
@@ -98,10 +98,16 @@ public class SimpleTextDiffProvider extends TwosideTextDiffProviderBase implemen
}
ComparisonManagerImpl comparisonManager = ComparisonManagerImpl.getInstanceImpl();
if (diffComputer != null || linesRanges == null) {
List<LineFragment> fragments = comparisonManager.compareLinesInner(text1, text2, lineOffsets1, lineOffsets2,
policy, innerFragments, indicator);
return Collections.singletonList(fragments);
if (linesRanges == null) {
if (diffComputer != null) {
List<LineFragment> fragments = diffComputer.compute(text1, text2, policy, innerFragments, indicator);
return Collections.singletonList(fragments);
}
else {
List<LineFragment> fragments = comparisonManager.compareLinesInner(text1, text2, lineOffsets1, lineOffsets2,
policy, innerFragments, indicator);
return Collections.singletonList(fragments);
}
}
else {
List<List<LineFragment>> result = new ArrayList<>();