diff: remove deprecated parameter

LineFragment can't contain inner fragments, if DiffConfig.innerFragments was set to False.
It was possible with old caching logic, that was removed some time ago.
This commit is contained in:
Aleksey Pivovarov
2015-10-26 19:56:16 +03:00
parent bbc6256621
commit eb9b40ef4e
4 changed files with 10 additions and 12 deletions
@@ -46,7 +46,7 @@ public class UnifiedDiffChange {
@NotNull private final List<RangeHighlighter> myHighlighters = new ArrayList<RangeHighlighter>();
@NotNull private final List<MyGutterOperation> myOperations = new ArrayList<MyGutterOperation>();
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 {
@@ -261,7 +261,6 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
}
});
final boolean innerFragments = getDiffConfig().innerFragments;
final List<LineFragment> 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<ChangedBlock> blocks,
@NotNull final LineNumberConvertor convertor,
@NotNull final List<LineRange> 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<UnifiedDiffChange> diffChanges = new ArrayList<UnifiedDiffChange>(blocks.size());
for (ChangedBlock block : blocks) {
diffChanges.add(new UnifiedDiffChange(UnifiedDiffViewer.this, block, innerFragments));
diffChanges.add(new UnifiedDiffChange(UnifiedDiffViewer.this, block));
}
List<RangeMarker> guarderRangeBlocks = new ArrayList<RangeMarker>();
@@ -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();
}
@@ -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));
}
}