topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

fix: some debugger issues

Browse Source
This commit is contained in:
TopchetoEU 2025-01-06 13:22:26 +02:00
parent 58e3546459
commit ba0b4e06ad
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/topchetoeu/jscript/repl/debug/SimpleDebugger.java
View File

@ -199,12 +199,15 @@ public class SimpleDebugger implements Debugger {
this.frame = frame; this.frame = frame;
this.id = id; this.id = id;
var map = DebugContext.get(frame.env).getMap(frame.function); var map = DebugContext.get(frame.env).getMapOrEmpty(frame.function);
this.globals = Value.global(frame.env); this.globals = Value.global(frame.env);
this.locals = ScopeObject.locals(frame, map.localNames); this.locals = ScopeObject.locals(frame, map.localNames);
this.capturables = ScopeObject.capturables(frame, map.capturableNames); this.capturables = ScopeObject.capturables(frame, map.capturableNames);
this.captures = ScopeObject.captures(frame, map.captureNames); this.captures = ScopeObject.captures(frame, map.captureNames);
this.variables = ScopeObject.combine((ObjectValue)this.globals, locals, capturables, captures); if (this.globals instanceof ObjectValue) {
this.variables = ScopeObject.combine((ObjectValue)this.globals, locals, capturables, captures);
}
else this.variables = ScopeObject.combine(null, locals, capturables, captures);
this.valstack = new StackObject(frame); this.valstack = new StackObject(frame);
} }
} }
@ -984,7 +987,7 @@ public class SimpleDebugger implements Debugger {
} }
try { try {
Value res = null; Value res = Value.UNDEFINED;
if (compare(src, VSCODE_EMPTY)) res = emptyObject; if (compare(src, VSCODE_EMPTY)) res = emptyObject;
else if (compare(src, VSCODE_SELF)) res = self; else if (compare(src, VSCODE_SELF)) res = self;
else if (compare(src, CHROME_GET_PROP_FUNC)) { else if (compare(src, CHROME_GET_PROP_FUNC)) {
@ -997,6 +1000,7 @@ public class SimpleDebugger implements Debugger {
else if (compare(src, VSCODE_CALL)) { else if (compare(src, VSCODE_CALL)) {
var func = (FunctionValue)(args.size() < 1 ? null : args.get(0)); var func = (FunctionValue)(args.size() < 1 ? null : args.get(0));
ws.send(msg.respond(new JSONMap().set("result", serializeObj(env, func.apply(env, self))))); ws.send(msg.respond(new JSONMap().set("result", serializeObj(env, func.apply(env, self)))));
return;
} }
else if (compare(src, VSCODE_AUTOCOMPLETE)) { else if (compare(src, VSCODE_AUTOCOMPLETE)) {
var target = args.get(0); var target = args.get(0);