Sprint 23/1

.github/workflows/package.yml

@@ -27,6 +27,9 @@ env:
 jobs:
   run-busted:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.sha }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v4
         with:

.gitignore

@@ -6,6 +6,7 @@
 dist/*
 web/dist/*
 web/dist-c/*
+web/wiki/*
 web/node_modules/*
 .debug/*
 doc/scratch/

justfile

@@ -20,9 +20,9 @@ unit_test_brief:
   @{{MON}} -e 'lua' --exec 'echo -en "\n\n\n\n------------- BUSTED -------------\n"; busted tests -o tests/brief_output.lua'
 unit_test_tag TAG:
   @{{MON}} -e lua \
-    --exec 'echo -en "\n\n\n\n------------- BUSTED -------------\n" ; busted tests --defer-print  --tags {{TAG}}'
+    --exec 'echo -en "\n\n\n\n------------- BUSTED -------------\n" ; busted tests --defer-print --tags="{{TAG}}"'
 unit_test_ast:
-  @SHOW_AST=1 just unit_test_tag ast
+  @just unit_test_tag ast
 unit_test_src:
   @SHOW_CODE=1 just unit_test_tag src
 unit_test_parser:

src/controller/consoleController.lua

@@ -98,25 +98,24 @@ end
 --- @return boolean success
 --- @return string? errmsg
 local function run_user_code(f, cc, project_path)
-  local gfx = love.graphics
   local output = cc.model.output
   local env = cc:get_base_env()
 
-  gfx.setCanvas(cc:get_canvas())
   local ok, call_err
-  if project_path then
-    env = cc:get_project_env()
-  end
-  ok, call_err = pcall(f)
-  if project_path and ok then -- user project exec
-    if love.PROFILE then
-      love.PROFILE.frame = 0
-      love.PROFILE.report = {}
+  cc:use_canvas(function()
+    if project_path then
+      env = cc:get_project_env()
     end
-    cc.main_ctrl.set_user_handlers(env['love'])
-  end
-  output:restore_main()
-  gfx.setCanvas()
+    ok, call_err = pcall(f)
+    if project_path and ok then -- user project exec
+      if love.PROFILE then
+        love.PROFILE.frame = 0
+        love.PROFILE.report = {}
+      end
+      cc.main_ctrl.set_user_handlers(env['love'], cc)
+    end
+    output:restore_main()
+  end)
   if not ok then
     local msg = LANG.get_call_error(call_err)
     return false, msg
@@ -429,12 +428,19 @@ function ConsoleController.prepare_project_env(cc)
   project_env.stop            = function()
     cc:stop_project_run()
   end
+  project_env.run             = function()
+    if love.state.app_state == 'inspect' then
+      cc:stop_project_run()
+      cc:run_project()
+    end
+  end
+  project_env.run_project     = project_env.run
 
   project_env.continue        = function()
     if love.state.app_state == 'inspect' then
       -- resume
       love.state.app_state = 'running'
-      cc.main_ctrl.restore_user_handlers()
+      cc.main_ctrl.restore_user_handlers(cc)
     else
       print('No project halted')
     end
@@ -766,8 +772,9 @@ end
 function ConsoleController:edit(name, state)
   if love.state.app_state == 'running' then return end
 
-  local PS    = self.model.projects
-  local p     = PS.current
+  local PS = self.model.projects
+  local p  = PS.current
+  if not p then return end
   local filename
   -- if state and state.buffer then
   --   filename = state.buffer.filename
@@ -1048,6 +1055,15 @@ function ConsoleController:get_canvas()
   return self.model.output.canvas
 end
 
+--- @param f function
+function ConsoleController:use_canvas(f)
+  local canvas = self.model.output.canvas
+  gfx.setCanvas(canvas)
+  local r = f()
+  gfx.setCanvas()
+  return r
+end
+
 --- @return ViewData
 function ConsoleController:get_viewdata()
   return {

src/controller/controller.lua

@@ -43,27 +43,27 @@ local _supported = {
   'touchreleased',
 }
 
-local _C, _mode
-
+--- @param C ConsoleController
 --- @param msg string
-local function user_error_handler(msg)
+local function user_error_handler(C, msg)
   Log.debug('user error: ' .. msg)
   local err = LANG.get_call_error(msg) or ''
   local user_msg = messages.exec_error(err)
-  _C:suspend_run(user_msg)
+  C:suspend_run(user_msg)
   print(user_msg)
 end
 
 --- @param f function
+--- @param C ConsoleController
 --- @param ...   any
 --- @return boolean success
 --- @return any result
 --- @return any ...
-local function wrap(f, ...)
+local function wrap(f, C, ...)
   if _G.web then
     local ok, r = pcall(f, ...)
     if not ok then
-      user_error_handler(r)
+      user_error_handler(C, r)
     end
     return r
   else
@@ -72,22 +72,29 @@ local function wrap(f, ...)
 end
 
 --- @param f function
+--- @param C ConsoleController
 --- @return function
-local function error_wrapper(f)
+local function error_wrapper(f, C)
   return function(...)
-    return wrap(f, ...)
+    local args = { ... }
+    C:use_canvas(
+      function()
+        return wrap(f, C, unpack(args))
+      end
+    )
   end
 end
 
 --- @param userlove table
-local set_handlers = function(userlove)
+--- @param C ConsoleController
+local set_handlers = function(userlove, C)
   --- @param key string
   local function hook_if_differs(key)
     local orig = Controller._defaults[key]
     local new = userlove[key]
     if orig and new and orig ~= new then
       --- @type function
-      love[key] = error_wrapper(new)
+      love[key] = error_wrapper(new, C)
     end
   end
 
@@ -384,7 +391,7 @@ Controller = {
         local draw = function()
           if ldr then
             gfx.push('all')
-            wrap(ldr)
+            wrap(ldr, C)
             gfx.pop()
           end
           local ui = get_user_input()
@@ -401,7 +408,9 @@ Controller = {
       local uup = Controller._userhandlers.update
       if user_update and uup
       then
-        wrap(uup, dt)
+        C:use_canvas(function()
+          wrap(uup, C, dt)
+        end)
       end
       if love.state.app_state == 'snapshot' then
         gfx.captureScreenshot(function(img)
@@ -477,11 +486,6 @@ Controller = {
   ----------------
   ---  public  ---
   ----------------
-  --- @param CC ConsoleController
-  init = function(CC, mode)
-    _C = CC
-    _mode = mode
-  end,
   --- @param C ConsoleController
   --- @param CV ConsoleView
   set_default_handlers = function(C, CV)
@@ -804,8 +808,9 @@ Controller = {
     save_if_differs('draw')
   end,
 
-  restore_user_handlers = function()
-    set_handlers(Controller._userhandlers)
+  --- @param C ConsoleController
+  restore_user_handlers = function(C)
+    set_handlers(Controller._userhandlers, C)
   end,
 
   clear_user_handlers = function()

src/examples/tixy/mathlib.lua

@@ -7,7 +7,7 @@ function hypot(a, b)
   return math.sqrt(a ^ 2 + b ^ 2)
 end
 
-require("bit")
+local bit = require("bit")
 for k, v in pairs(bit or {}) do
   _G[k] = v
 end

src/main.lua

@@ -353,10 +353,11 @@ function love.load()
   local CC = ConsoleController(CM, ctrl)
   local CV = ConsoleView(baseconf, CC)
 
-  ctrl.init(CC, mode)
   ctrl.setup_callback_handlers(CC)
   ctrl.set_default_handlers(CC, CV)
 
+  gfx.setColor(0, 0, 0, 1)
+
   if playback then
     local ok, err = CC:open_project('play', true)
     if not ok then

src/model/editor/bufferModel.lua

@@ -232,7 +232,7 @@ function BufferModel:move_selection(dir, by, warp, move)
     end
   end
   if dir == 'down' then
-    if (cur + by) <= last then
+    if (cur + by) <= last + 1 then
       self.selection = cur + by
       return true
     end

src/model/input/userInputModel.lua

@@ -857,7 +857,7 @@ function UserInputModel:get_wrapped_error()
     local we = string.wrap_array(
       e,
       self.visible.wrap_w)
-      table.insert(we, 1, 'Errors:')
+    table.insert(we, 1, 'Errors:')
     return we
   end
 end
@@ -880,7 +880,10 @@ end
 
 --- @return boolean
 function UserInputModel:has_error()
-  return string.is_non_empty_string_array(self.error)
+  if self.error and #(self.error) > 0 then
+    return true
+  end
+  return false
 end
 
 --- @param eval Evaluator

src/model/io/redirect.lua

@@ -5,11 +5,11 @@ local function set_print(M)
   local origPrint = _G.print
   _G.orig_print = origPrint
   local magicPrint = function(...)
-    local arg = { ... }
     local out = ''
-    local l = #arg
-    for i, v in ipairs(arg) do
-      out = out .. tostring(v)
+    local l = select('#', ...)
+    local args = { ... }
+    for i = 1, l do
+      out = out .. tostring(args[i])
       if i ~= l then out = out .. '\t' end
     end
     origPrint(out)

src/model/lang/lua/parser.lua

@@ -7,11 +7,9 @@ require("util.dequeue")
 
 --- @class luaAST : token
 
---- @alias CPos 'first'|'last'
-
 --- @class Comment
 --- @field text string
---- @field position CPos
+--- @field position CommentPos
 --- @field idf integer
 --- @field idl integer
 --- @field first Cursor
@@ -318,6 +316,10 @@ return function(lib)
         local idx = 1  -- block number
         local last = 0 -- last line number
         local comment_ids = {}
+        --- Create chunk from comment text and pos
+        --- @param ctext str
+        --- @param c Comment
+        --- @param range Range
         local add_comment_block = function(ctext, c, range)
           ret:insert(
             Chunk.new(ctext, range),
@@ -326,7 +328,7 @@ return function(lib)
           comment_ids[c.idl] = true
         end
         --- @param comments Comment[]
-        --- @param pos CPos
+        --- @param pos CommentPos
         local get_comments = function(comments, pos)
           for _, c in ipairs(comments) do
             -- Log.warn('c', c.position)
@@ -415,7 +417,7 @@ return function(lib)
 
         if
             ret:last().tag ~= 'empty' and (
-              --- no empty line at EOF
+            --- no empty line at EOF
               not single
               --- there is an empty line at the end
               or single and (#string.lines(text) > last)

src/util/debug.lua

@@ -199,9 +199,13 @@ local function terse_ast(ast, skip_lineinfo, style)
 
           if type(k) == 'table' then
             res = res .. dent .. terse(k, omit, style) .. assign
-          elseif type(k) == 'number' and style == 'lua' then
-            -- skip index
-            res = res .. dent .. '[' .. k .. '] ' .. assign
+          elseif type(k) == 'number' then
+            if style == 'lua' then
+              -- skip index
+              res = res .. dent .. '[' .. k .. '] ' .. assign
+            elseif style == 'json5' then
+              res = res .. dent .. '"' .. k .. '"' .. assign
+            end
           elseif type(k) == 'string'
               and not string.forall(k, Char.is_ascii)
           then
@@ -320,7 +324,7 @@ Debug = {
     if type(t) == 'table' then
       local start = math.max(1, skip or 0)
       for i = start, #t do
-        local l = t[i] or ''
+        local l = tostring(t[i]) or ''
         local line = (function()
           if not no_ln then
             return string.format("#%02d: %s\n", i, text(l))

src/view/consoleView.lua

@@ -60,11 +60,13 @@ function ConsoleView:draw(terminal, canvas, snapshot)
     self.editor:draw()
   end
 
+  gfx.push('all')
   if love.state.app_state == 'editor' then
     drawEditor()
   else
     drawConsole()
   end
+  gfx.pop()
 end
 
 function ConsoleView:draw_placeholder()

src/view/editor/editorView.lua

@@ -36,12 +36,16 @@ function EditorView:draw()
     local spec = mode == 'reorder'
     local bv = self:get_current_buffer()
 
+    gfx.push('all')
     if ViewUtils.conditional_draw('show_buffer') then
       bv:draw(spec)
     end
     if ViewUtils.conditional_draw('show_input') then
+      gfx.push('all')
       self.input:draw()
+      gfx.pop()
     end
+    gfx.pop()
   end
 end