diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java index 00e1892b05c7..7776a21bb824 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java @@ -35,13 +35,14 @@ import java.util.List; public class OnesideEditorRangeHighlighter { public static final Logger LOG = OnesideDiffViewer.LOG; - @NotNull private final List myPieces; + @NotNull private final List myPieces = new ArrayList(); public OnesideEditorRangeHighlighter(@Nullable Project project, @NotNull Document document) { ApplicationManager.getApplication().assertReadAccessAllowed(); MarkupModelEx model = (MarkupModelEx)DocumentMarkupModel.forDocument(document, project, false); - myPieces = new ArrayList(); + if (model == null) return; + model.processRangeHighlightersOverlappingWith(0, document.getTextLength(), new Processor() { @Override public boolean process(RangeHighlighterEx marker) { @@ -63,7 +64,6 @@ public class OnesideEditorRangeHighlighter { MarkupModelEx model1 = (MarkupModelEx)DocumentMarkupModel.forDocument(document1, project, false); MarkupModelEx model2 = (MarkupModelEx)DocumentMarkupModel.forDocument(document2, project, false); - myPieces = new ArrayList(); init(model1, model2, ranges); }