From 622c1df75a3b390f4fe41378f399405cf1e6493d Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 28 May 2014 11:56:17 +0400
Subject: [PATCH] NPE

---
 .../codeInsight/daemon/impl/PostHighlightingPass.java    | 9 ++++-----
 .../codeHighlighting/TextEditorHighlightingPass.java     | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
index 0ebedbce01c0..3cd72560f13e 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
@@ -72,10 +72,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class PostHighlightingPass extends ProgressableTextEditorHighlightingPass {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.PostHighlightingPass");
@@ -165,9 +162,11 @@ public class PostHighlightingPass extends ProgressableTextEditorHighlightingPass
     }
   }
 
+  @NotNull
   @Override
   public List<HighlightInfo> getInfos() {
-    return myHighlights == null ? null : new ArrayList<HighlightInfo>(myHighlights);
+    Collection<HighlightInfo> infos = myHighlights;
+    return infos == null ? Collections.<HighlightInfo>emptyList() : new ArrayList<HighlightInfo>(infos);
   }
 
   @Override
diff --git a/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
index 741ba29c7583..6e30e2d4ac4d 100644
--- a/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
+++ b/platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
 import java.util.List;
 
 public abstract class TextEditorHighlightingPass implements HighlightingPass {
@@ -113,9 +114,9 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
     myId = id;
   }
 
-  @Nullable
+  @NotNull
   public List<HighlightInfo> getInfos() {
-    return null;
+    return Collections.emptyList();
   }
 
   @NotNull