IDEA-154821 Watches marks broken

This commit is contained in:
Egor.Ushakov
2016-04-15 20:46:51 +03:00
parent 1f8e1ce704
commit 6d5ff19a4c
2 changed files with 9 additions and 1 deletions
@@ -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;
@@ -164,7 +164,7 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> 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()));
}