MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-144431 debug information unavailable on own code in EAP 15 - better exceptions processing

Browse Source
This commit is contained in:
Egor.Ushakov
2015-09-03 12:48:20 +03:00
parent d957408137
commit ad4a7d02f5
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java
+9 -12
View File
@@ -19,7 +19,6 @@ import com.intellij.codeInspection.SmartHashMap;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.engine.DebugProcess;
import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil;
import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
import com.intellij.debugger.ui.tree.NodeDescriptor;
import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
@@ -27,6 +26,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Key;
import com.intellij.util.containers.HashMap;
import com.intellij.xdebugger.impl.ui.tree.ValueMarkup;
import com.sun.jdi.InconsistentDebugInfoException;
import com.sun.jdi.InvalidStackFrameException;
import com.sun.jdi.ObjectReference;
import org.jetbrains.annotations.Nullable;
@@ -82,9 +82,15 @@ public abstract class NodeDescriptorImpl implements NodeDescriptor {
myEvaluateException = null;
myLabel = calcRepresentation(context, labelListener);
}
catch (InconsistentDebugInfoException e) {
throw new EvaluateException(DebuggerBundle.message("error.inconsistent.debug.info"));
}
catch (InvalidStackFrameException e) {
throw new EvaluateException(DebuggerBundle.message("error.invalid.stackframe"));
}
catch (RuntimeException e) {
LOG.debug(e);
throw processException(e);
LOG.error(e);
throw new EvaluateException("Internal error, see logs for more details");
}
}
catch (EvaluateException e) {
@@ -94,15 +100,6 @@ public abstract class NodeDescriptorImpl implements NodeDescriptor {
protected abstract String calcRepresentation(EvaluationContextImpl context, DescriptorLabelListener labelListener) throws EvaluateException;
private static EvaluateException processException(Exception e) {
if (e instanceof InvalidStackFrameException) {
return new EvaluateException(DebuggerBundle.message("error.invalid.stackframe"), null);
}
else {
return EvaluateExceptionUtil.createEvaluateException(e);
}
}
@Override
public void displayAs(NodeDescriptor descriptor) {
if (descriptor instanceof NodeDescriptorImpl) {