From 6c4bf42e05270ab05ee228e3b4e2613d68a93b6a Mon Sep 17 00:00:00 2001 From: "andrey.zaytsev" Date: Tue, 4 Sep 2012 22:50:49 +0400 Subject: [PATCH] breakpoints-ui. esc in balloon with lookup open leads to closing balloon, not only lookup. --- .../xdebugger/impl/ui/BreakpointEditor.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java index d4bf5b52e11d..df9a22a52f0a 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java @@ -15,10 +15,10 @@ */ package com.intellij.xdebugger.impl.ui; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.CompositeShortcutSet; -import com.intellij.openapi.actionSystem.CustomShortcutSet; +import com.intellij.codeInsight.lookup.LookupManager; +import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; @@ -75,6 +75,14 @@ public class BreakpointEditor { }); final AnAction doneAction = new AnAction() { + @Override + public void update(AnActionEvent e) { + super.update(e); + boolean lookup = LookupManager.getInstance(getEventProject(e)).getActiveLookup() != null; + Editor editor = e.getData(PlatformDataKeys.EDITOR); + e.getPresentation().setEnabled(!lookup && (editor == null || StringUtil.isEmpty(editor.getSelectionModel().getSelectedText())) ); + } + public void actionPerformed(AnActionEvent e) { done(); }