From e1bd06830bff408735c66a5ec02935d20dda6b60 Mon Sep 17 00:00:00 2001 From: bptato Date: Mon, 25 Nov 2024 21:26:34 +0100 Subject: client: exit if quit was called inside a job ref. https://todo.sr.ht/~bptato/chawan/27 --- src/local/client.nim | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/local/client.nim b/src/local/client.nim index 3bef5c75..1669898c 100644 --- a/src/local/client.nim +++ b/src/local/client.nim @@ -93,14 +93,6 @@ proc interruptHandler(rt: JSRuntime; opaque: pointer): cint {.cdecl.} = discard return 0 -proc runJSJobs(client: Client) = - while true: - let r = client.jsrt.runJSJobs() - if r.isSome: - break - let ctx = r.error - ctx.writeException(client.console.err) - proc cleanup(client: Client) = if client.alive: client.alive = false @@ -118,6 +110,16 @@ proc quit(client: Client; code = 0) = client.cleanup() quit(code) +proc runJSJobs(client: Client) = + while true: + let r = client.jsrt.runJSJobs() + if r.isSome: + break + let ctx = r.error + ctx.writeException(client.console.err) + if client.exitCode != -1: + client.quit(0) + proc evalJS(client: Client; src, filename: string; module = false): JSValue = client.pager.term.unblockStdin() let flags = if module: @@ -426,8 +428,7 @@ proc input(client: Client): EmptyPromise = client.feednext = false client.pager.inputBuffer = "" if p == nil: - p = EmptyPromise() - p.resolve() + p = newResolvedPromise() return p proc consoleBuffer(client: Client): Container {.jsfget.} = -- cgit