diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/javascript/jsc/bindings/headers-cpp.h | 2 | ||||
| -rw-r--r-- | src/javascript/jsc/bindings/headers.h | 2 | ||||
| -rw-r--r-- | src/javascript/jsc/javascript.zig | 42 |
3 files changed, 17 insertions, 29 deletions
diff --git a/src/javascript/jsc/bindings/headers-cpp.h b/src/javascript/jsc/bindings/headers-cpp.h index ee99ba75c..c40eb5c36 100644 --- a/src/javascript/jsc/bindings/headers-cpp.h +++ b/src/javascript/jsc/bindings/headers-cpp.h @@ -1,4 +1,4 @@ -//-- AUTOGENERATED FILE -- 1647318604 +//-- AUTOGENERATED FILE -- 1647432636 // clang-format off #pragma once diff --git a/src/javascript/jsc/bindings/headers.h b/src/javascript/jsc/bindings/headers.h index fcdf4ad5e..d4560f9ac 100644 --- a/src/javascript/jsc/bindings/headers.h +++ b/src/javascript/jsc/bindings/headers.h @@ -1,5 +1,5 @@ // clang-format: off -//-- AUTOGENERATED FILE -- 1647318604 +//-- AUTOGENERATED FILE -- 1647432636 #pragma once #include <stddef.h> diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig index 9e9a8c9f8..1c6074180 100644 --- a/src/javascript/jsc/javascript.zig +++ b/src/javascript/jsc/javascript.zig @@ -1953,6 +1953,8 @@ pub const VirtualMachine = struct { _ = this.ready_tasks_count.fetchSub(add, .Monotonic); } } + + // TODO: fix this technical debt pub fn tick(this: *EventLoop) void { while (true) { this.tickConcurrent(); @@ -1965,6 +1967,7 @@ pub const VirtualMachine = struct { } } + // TODO: fix this technical debt pub fn waitForPromise(this: *EventLoop, promise: *JSC.JSInternalPromise) void { switch (promise.status(this.global.vm())) { JSC.JSPromise.Status.Pending => { @@ -3304,36 +3307,21 @@ pub const VirtualMachine = struct { writer.writeByteNTimes(' ', pad) catch unreachable; const top = exception.stack.frames()[0]; var remainder = std.mem.trim(u8, source.text, "\n"); - if (@intCast(usize, top.position.column_stop) > remainder.len or (top.position.column_stop - top.position.column_start) <= 0) { - writer.print( - comptime Output.prettyFmt( - "<r><d>{d} |<r> {s}\n", - allow_ansi_color, - ), - .{ source.line, remainder }, - ) catch unreachable; - } else { - const prefix = remainder[0..@intCast(usize, top.position.column_start)]; - const underline = remainder[@intCast(usize, top.position.column_start)..@intCast(usize, top.position.column_stop)]; - const suffix = remainder[@intCast(usize, top.position.column_stop)..]; - writer.print( - comptime Output.prettyFmt( - "<r><d>{d} |<r> {s}<red>{s}<r>{s}<r>\n<r>", - allow_ansi_color, - ), - .{ - source.line, - prefix, - underline, - suffix, - }, - ) catch unreachable; + writer.print( + comptime Output.prettyFmt( + "<r><d>{d} |<r> {s}\n", + allow_ansi_color, + ), + .{ source.line, remainder }, + ) catch unreachable; + + if (!top.position.isInvalid()) { var first_non_whitespace = @intCast(u32, top.position.column_start); while (first_non_whitespace < source.text.len and source.text[first_non_whitespace] == ' ') { first_non_whitespace += 1; } - const indent = @intCast(usize, pad) + " | ".len + first_non_whitespace + 1; + const indent = @intCast(usize, pad) + " | ".len + first_non_whitespace; writer.writeByteNTimes(' ', indent) catch unreachable; writer.print(comptime Output.prettyFmt( @@ -3514,10 +3502,10 @@ pub const EventListenerMixin = struct { if (promise.status(vm.global.vm()) == .Rejected) { onError(ctx, error.JSError, promise.result(vm.global.vm()), request_context) catch {}; return; - } else { - _ = promise.result(vm.global.vm()); } + _ = promise.result(vm.global.vm()); + vm.waitForTasks(); if (request_context.has_called_done) { |