diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java index 5959f21ab8fe..7e5ff524f1fa 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java @@ -46,7 +46,7 @@ public class UnifiedDiffChange { @NotNull private final List myHighlighters = new ArrayList(); @NotNull private final List myOperations = new ArrayList(); - public UnifiedDiffChange(@NotNull UnifiedDiffViewer viewer, @NotNull ChangedBlock block, boolean innerFragments) { + public UnifiedDiffChange(@NotNull UnifiedDiffViewer viewer, @NotNull ChangedBlock block) { myViewer = viewer; myEditor = viewer.getEditor(); @@ -57,7 +57,7 @@ public class UnifiedDiffChange { TextRange deleted = new TextRange(block.getStartOffset1(), block.getEndOffset1()); TextRange inserted = new TextRange(block.getStartOffset2(), block.getEndOffset2()); - installHighlighter(deleted, inserted, innerFragments); + installHighlighter(deleted, inserted); } public void destroyHighlighter() { @@ -72,10 +72,10 @@ public class UnifiedDiffChange { myOperations.clear(); } - private void installHighlighter(@NotNull TextRange deleted, @NotNull TextRange inserted, boolean innerFragments) { + private void installHighlighter(@NotNull TextRange deleted, @NotNull TextRange inserted) { assert myHighlighters.isEmpty(); - if (innerFragments && myLineFragment.getInnerFragments() != null) { + if (myLineFragment.getInnerFragments() != null) { doInstallHighlighterWithInner(deleted, inserted); } else { diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java index a219092e0fcb..76008f26f0d2 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java @@ -261,7 +261,6 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { } }); - final boolean innerFragments = getDiffConfig().innerFragments; final List fragments = DiffUtil.compare(texts[0], texts[1], getDiffConfig(), indicator); final DocumentContent content1 = getContent1(); @@ -298,7 +297,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { CombinedEditorData editorData = new CombinedEditorData(builder.getText(), data.getHighlighter(), data.getRangeHighlighter(), fileType, convertor.createConvertor1(), convertor.createConvertor2()); - return apply(editorData, builder.getBlocks(), convertor, changedLines, isEqual, innerFragments); + return apply(editorData, builder.getBlocks(), convertor, changedLines, isEqual); } catch (DiffTooBigException e) { return new Runnable() { @@ -373,7 +372,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { @NotNull final List blocks, @NotNull final LineNumberConvertor convertor, @NotNull final List changedLines, - final boolean isEqual, final boolean innerFragments) { + final boolean isEqual) { return new Runnable() { @Override public void run() { @@ -407,7 +406,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { ArrayList diffChanges = new ArrayList(blocks.size()); for (ChangedBlock block : blocks) { - diffChanges.add(new UnifiedDiffChange(UnifiedDiffViewer.this, block, innerFragments)); + diffChanges.add(new UnifiedDiffChange(UnifiedDiffViewer.this, block)); } List guarderRangeBlocks = new ArrayList(); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java index bb93bc6b9d0e..6012afb18286 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java @@ -50,12 +50,11 @@ public class SimpleDiffChange { // TODO: adjust color from inner fragments - configurable public SimpleDiffChange(@NotNull SimpleDiffViewer viewer, - @NotNull LineFragment fragment, - boolean inlineHighlight) { + @NotNull LineFragment fragment) { myViewer = viewer; myFragment = fragment; - myInnerFragments = inlineHighlight ? fragment.getInnerFragments() : null; + myInnerFragments = fragment.getInnerFragments(); installHighlighter(); } diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java index 362e67da80a8..d1e972de9020 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java @@ -239,7 +239,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { if (data.getFragments() != null) { for (LineFragment fragment : data.getFragments()) { - myDiffChanges.add(new SimpleDiffChange(SimpleDiffViewer.this, fragment, getHighlightPolicy().isFineFragments())); + myDiffChanges.add(new SimpleDiffChange(SimpleDiffViewer.this, fragment)); } }