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: fix NPE

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-02-09 15:08:21 +03:00
parent deb6540850
commit 1122400c50
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java
+3 -3
View File
@@ -35,13 +35,14 @@ import java.util.List;
public class OnesideEditorRangeHighlighter {
public static final Logger LOG = OnesideDiffViewer.LOG;
@NotNull private final List<Element> myPieces;
@NotNull private final List<Element> myPieces = new ArrayList<Element>();
public OnesideEditorRangeHighlighter(@Nullable Project project, @NotNull Document document) {
ApplicationManager.getApplication().assertReadAccessAllowed();
MarkupModelEx model = (MarkupModelEx)DocumentMarkupModel.forDocument(document, project, false);
myPieces = new ArrayList<Element>();
if (model == null) return;
model.processRangeHighlightersOverlappingWith(0, document.getTextLength(), new Processor<RangeHighlighterEx>() {
@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<Element>();
init(model1, model2, ranges);
}