From bc0826f4e0ddaa5e2f70b78542d3896be3a53df0 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 13 Apr 2016 11:33:59 +0300
Subject: [PATCH] do not highlight errors in return statements in debugger code
 fragments - avoid user data keys (IDEA-CR-10075)

---
 .../engine/evaluation/DefaultCodeFragmentFactory.java         | 2 --
 .../codeInsight/daemon/impl/analysis/HighlightUtil.java       | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/DefaultCodeFragmentFactory.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/DefaultCodeFragmentFactory.java
index a69cd899f960..830ecbb70a63 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/DefaultCodeFragmentFactory.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/DefaultCodeFragmentFactory.java
@@ -18,7 +18,6 @@ package com.intellij.debugger.engine.evaluation;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionService;
 import com.intellij.codeInsight.completion.JavaCompletionUtil;
-import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.codeinsight.RuntimeTypeEvaluator;
 import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilder;
@@ -76,7 +75,6 @@ public class DefaultCodeFragmentFactory extends CodeFragmentFactory {
     fragment.setVisibilityChecker(JavaCodeFragment.VisibilityChecker.EVERYTHING_VISIBLE);
     //noinspection HardCodedStringLiteral
     fragment.putUserData(KEY, "DebuggerComboBoxEditor.IS_DEBUGGER_EDITOR");
-    fragment.putUserData(HighlightUtil.DISABLE_RETURN_CHECK_IN_CODE_FRAGMENT, true);
     fragment.putCopyableUserData(JavaCompletionUtil.DYNAMIC_TYPE_EVALUATOR, new PairFunction<PsiExpression, CompletionParameters, PsiType>() {
       public PsiType fun(PsiExpression expression, CompletionParameters parameters) {
         if (!RuntimeTypeEvaluator.isSubtypeable(expression)) {
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 0cda6140d70e..0e0cc7d63a3c 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -87,8 +87,6 @@ public class HighlightUtil extends HighlightUtilBase {
   @NonNls private static final String SERIAL_PERSISTENT_FIELDS_FIELD_NAME = "serialPersistentFields";
   private static final QuickFixFactory QUICK_FIX_FACTORY = QuickFixFactory.getInstance();
 
-  public static final Key<Boolean> DISABLE_RETURN_CHECK_IN_CODE_FRAGMENT = Key.create("DISABLE_RETURN_CHECK_IN_CODE_FRAGMENT");
-
   private HighlightUtil() { }
 
   static {
@@ -596,7 +594,7 @@ public class HighlightUtil extends HighlightUtilBase {
       }
       parent = parent.getParent();
     }
-    if (parent instanceof PsiCodeFragment && parent.getUserData(DISABLE_RETURN_CHECK_IN_CODE_FRAGMENT) != null) {
+    if (parent instanceof PsiCodeFragment) {
       return null;
     }
     String description;