From 6c74dbc6b50c76f9a91183bfaeadd81dd38f53cb Mon Sep 17 00:00:00 2001
From: Alexander Kirillin <Alexander.Kirillin@jetbrains.com>
Date: Tue, 25 Jun 2013 15:19:16 +0400
Subject: [PATCH] EA-46969

---
 .../src/com/intellij/lang/annotation/ProblemGroup.java         | 3 +++
 .../com/intellij/codeInsight/daemon/impl/HighlightInfo.java    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/analysis-api/src/com/intellij/lang/annotation/ProblemGroup.java b/platform/analysis-api/src/com/intellij/lang/annotation/ProblemGroup.java
index d778e7ff568a..585d087df553 100644
--- a/platform/analysis-api/src/com/intellij/lang/annotation/ProblemGroup.java
+++ b/platform/analysis-api/src/com/intellij/lang/annotation/ProblemGroup.java
@@ -15,10 +15,13 @@
  */
 package com.intellij.lang.annotation;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * Unique object, which is the same for all of the problems of some group.
  * It is used to split some inspection to several fake inspections
  */
 public interface ProblemGroup {
+  @Nullable
   String getProblemName();
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
index 3f3ad4b379b0..cf55516fb994 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
@@ -766,7 +766,8 @@ public class HighlightInfo implements Segment {
       List<IntentionAction> options = myOptions;
       HighlightDisplayKey key = myKey;
       if (myProblemGroup != null) {
-        HighlightDisplayKey problemGroupKey = HighlightDisplayKey.findById(myProblemGroup.getProblemName());
+        String problemName = myProblemGroup.getProblemName();
+        HighlightDisplayKey problemGroupKey = problemName != null ? HighlightDisplayKey.findById(problemName) : null;
         if (problemGroupKey != null) {
           key = problemGroupKey;
         }