Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 541ed51

Browse files
deps: chakrashim add evaluate to pending message if not on break
1 parent fa7f205 commit 541ed51

File tree

1 file changed

+26
-23
lines changed

1 file changed

+26
-23
lines changed

deps/chakrashim/lib/chakra_debug.js

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -854,31 +854,34 @@
854854
V8CommandProcessor.prototype.evaluate = function (request, response) {
855855
// {'command':'evaluate','arguments':{'expression':'x','disable_break':true,'maxStringLength':10000,'frame':0},'type':'request','seq':35}
856856
// {'seq':37,'request_seq':35,'type':'response','command':'evaluate','success':true,'body':{'handle':13,'type':'number','value':1,'text':'1'},'refs':[],'running':false}
857-
if (globalExecutionState) {
858-
var frames = globalExecutionState.GetFrames();
859-
var frame = frames[0];
860-
if (request.arguments) {
861-
if (typeof request.arguments.frame == 'number') {
862-
for (var i = 0; i < frames.length; ++i) {
863-
if (request.arguments.frame == frames[i].GetIndex()) {
864-
frame = frames[i];
865-
break;
866-
}
867-
}
868-
} else if (request.arguments.global == true) {
869-
frame = frames[frames.length - 1];
870-
}
871-
872-
var evalResult = frame.Evaluate(request.arguments.expression);
873-
AddChildrens(evalResult[1]);
874-
response.success = evalResult[0];
875-
response.body = evalResult[1];
876-
response.refs = [];
877-
} else {
878-
response.pending = true;
879-
pendingMessages.push({ request: request, response: response });
857+
if (globalExecutionState) {
858+
var frames = globalExecutionState.GetFrames();
859+
var frame = frames[0];
860+
if (request.arguments) {
861+
if (typeof request.arguments.frame == 'number') {
862+
for (var i = 0; i < frames.length; ++i) {
863+
if (request.arguments.frame == frames[i].GetIndex()) {
864+
frame = frames[i];
865+
break;
866+
}
880867
}
868+
} else if (request.arguments.global == true) {
869+
frame = frames[frames.length - 1];
870+
}
871+
872+
var evalResult = frame.Evaluate(request.arguments.expression);
873+
AddChildrens(evalResult[1]);
874+
response.success = evalResult[0];
875+
response.body = evalResult[1];
876+
response.refs = [];
877+
} else {
878+
response.success = false;
881879
}
880+
}
881+
else {
882+
response.pending = true;
883+
pendingMessages.push({ request: request, response: response });
884+
}
882885
};
883886

884887
V8CommandProcessor.prototype.threads = function (request, response) {

0 commit comments

Comments
 (0)