From 34f1169f82cc02303bbb65638ecbaa5efaa3dfa0 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 7 Dec 2010 18:53:27 +0300
Subject: [PATCH] [r=cdr] fix regression: empty default log message text when
 add breakpoint action with shift-click

---
 .../src/com/intellij/debugger/impl/EditorTextProvider.java  | 2 ++
 .../intellij/debugger/impl/JavaEditorTextProviderImpl.java  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/EditorTextProvider.java b/java/debugger/impl/src/com/intellij/debugger/impl/EditorTextProvider.java
index 6b47a11fa2cb..849b62592ec5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/EditorTextProvider.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/EditorTextProvider.java
@@ -18,6 +18,7 @@ package com.intellij.debugger.impl;
 import com.intellij.debugger.engine.evaluation.TextWithImports;
 import com.intellij.lang.LanguageExtension;
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides text in the editor for Evaluate expression action
@@ -26,5 +27,6 @@ import com.intellij.psi.PsiElement;
 public interface EditorTextProvider {
   LanguageExtension<EditorTextProvider> EP = new LanguageExtension<EditorTextProvider>("com.intellij.debuggerEditorTextProvider");
 
+  @Nullable
   TextWithImports getEditorText(PsiElement elementAtCaret);
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/JavaEditorTextProviderImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/JavaEditorTextProviderImpl.java
index 4dc6514fd7dd..a4fa15454efe 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/JavaEditorTextProviderImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/JavaEditorTextProviderImpl.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 public class JavaEditorTextProviderImpl implements EditorTextProvider {
   @Override
   public TextWithImports getEditorText(PsiElement elementAtCaret) {
-    String result = "";
+    String result = null;
     PsiElement element = findExpression(elementAtCaret);
     if (element != null) {
       if (element instanceof PsiReferenceExpression) {
@@ -43,11 +43,11 @@ public class JavaEditorTextProviderImpl implements EditorTextProvider {
           }
         }
       }
-      if (result.length() == 0) {
+      if (result == null) {
         result = element.getText();
       }
     }
-    return new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, result);
+    return result != null? new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, result) : null;
   }
 
   @Nullable