Merge branch 'amakeev/debugger-error-reporting'

This commit is contained in:
Anton Makeev
2016-02-08 14:18:15 +01:00
2 changed files with 9 additions and 1 deletions
@@ -28,11 +28,11 @@ import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.UsefulTestCase;
import com.intellij.util.ui.TextTransferable;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.breakpoints.*;
import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
import com.intellij.xdebugger.frame.*;
import com.intellij.xdebugger.frame.XNamedValue;
import com.intellij.xdebugger.impl.XDebugSessionImpl;
import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil;
import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl;
@@ -117,6 +117,12 @@ public class XDebuggerTestUtil {
throws InterruptedException {
return collectStacks(thread == null ? getActiveThread(session) : thread);
}
public static String getFramePresentation(XStackFrame frame) {
TextTransferable.ColoredStringBuilder builder = new TextTransferable.ColoredStringBuilder();
frame.customizePresentation(builder);
return builder.getBuilder().toString();
}
public static List<XStackFrame> collectStacks(@NotNull XExecutionStack thread) throws InterruptedException {
return collectStacks(thread, TIMEOUT * 2);
@@ -11,6 +11,7 @@ import javax.swing.*;
import java.util.concurrent.Semaphore;
public class XTestValueNode extends XValueNodePresentationConfigurator.ConfigurableXValueNodeImpl {
public Icon myIcon;
public String myName;
public String myType;
public String myValue;
@@ -24,6 +25,7 @@ public class XTestValueNode extends XValueNodePresentationConfigurator.Configura
public void applyPresentation(@Nullable Icon icon,
@NotNull XValuePresentation valuePresentation,
boolean hasChildren) {
myIcon = icon;
myType = valuePresentation.getType();
myValue = XValuePresentationUtil.computeValueText(valuePresentation);
myHasChildren = hasChildren;