From 1122400c50848043bd2b9426bc96fa37a8667d37 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 9 Feb 2015 15:01:39 +0300
Subject: [PATCH] diff: fix NPE

---
 .../tools/fragmented/OnesideEditorRangeHighlighter.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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<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);
   }