Update debugger

debugger.lua

@@ -28,14 +28,19 @@ end
 local function debugREPL(onResult, debugArgs)
   local globalEnv = copyObject(_ENV)
   globalEnv._debug = debugArgs
+  local shouldExit = false
+  globalEnv.exit = function()
+    shouldExit = true
+  end
   local result, retval
   repeat
     result, retval = execDebug(globalEnv)
     if result and type(onResult) == "function" then
       onResult(retval)
     end
-  until not result
-  return retval
+  until shouldExit or not result
+  local success = result and shouldExit
+  return success, (not success and retval) or nil
 end
 
 return { debugREPL = debugREPL, execDebug = execDebug }

storage/itemstack.lua

@@ -8,12 +8,15 @@ local ItemStack = Sentinel:tag({}, Sentinel.ITEMSTACK)
 ItemStack.__index = ItemStack
 
 local function hookDebugger(context)
-  while true do
-    local errorCond = Debugger.debugREPL(function(retval)
-      Logger:error("->", retval)
+  local result, retval
+  repeat
+    result, retval = Debugger.debugREPL(function(r)
+      Logger:error("->", r)
     end, context)
-    Logger:error("x>", errorCond)
+    if not result then
+      Logger:error("x>", retval)
     end
+  until result
 end
 
 function ItemStack:fromDetail(inv, detail, slot)