From 6d5ff19a4cb5156689e260acef2d365322d87e9b Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Fri, 15 Apr 2016 20:44:02 +0300 Subject: [PATCH] IDEA-154821 Watches marks broken --- .../xdebugger/impl/ui/tree/nodes/WatchNodeImpl.java | 8 ++++++++ .../xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchNodeImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchNodeImpl.java index b45155476696..9606adff63c2 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchNodeImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchNodeImpl.java @@ -52,6 +52,14 @@ public class WatchNodeImpl extends XValueNodeImpl implements WatchNode { return myExpression; } + @NotNull + @Override + public XValue getValueContainer() { + XValue container = super.getValueContainer(); + XValue value = ((XWatchValue)container).myValue; + return value != null ? value : container; + } + private static class XWatchValue extends XNamedValue { private final XExpression myExpression; private final XStackFrame myStackFrame; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java index ac6032161ce1..9d8ee01502af 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java @@ -164,7 +164,7 @@ public class XValueNodeImpl extends XValueContainerNode implements XValu myText.clear(); XValueMarkers markers = myTree.getValueMarkers(); if (markers != null) { - ValueMarkup markup = markers.getMarkup(myValueContainer); + ValueMarkup markup = markers.getMarkup(getValueContainer()); if (markup != null) { myText.append("[" + markup.getText() + "] ", new SimpleTextAttributes(SimpleTextAttributes.STYLE_BOLD, markup.getColor())); }