akkartik/wardley.love - Change 7P6XKA2DCFG5YJAVTCAZMQNNDJ6K6OO5AILBBCVYV37XKZNYKHPAC

Merge lines.love

Created by Kartik K. Agaram on September 18, 2022

7P6XKA2DCFG5YJAVTCAZMQNNDJ6K6OO5AILBBCVYV37XKZNYKHPAC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[9.2] → [10.147062:147101]

BFD:BFD[10.147101] → [10.83723:83723]

B:BD[10.84036] → [7.7:82]

B:BD[10.84630] → [7.83:139]

B:BD[10.86501] → [7.140:194]

∅:D[7.194] → [10.86538:88179]

∅:D[7.139] → [10.84669:85853]

∅:D[7.82] → [10.84098:84630]

function Text.draw(State, line_index, y, startpos, startposB, hide_cursor)
      if not hide_cursor and not State.search_term then
    if not hide_cursor and not State.search_term then
--?       if line_index == 8 then print('c', State.cursor1.line, State.cursor1.posB, line_index, pos) end
      if line_index == State.cursor1.line and State.cursor1.posB == pos then
        Text.draw_cursor(State, x, y)
      end
    end
  end
  return y, nil, screen_line_starting_pos
end
-- Given an array of fragments, draw the subset starting from pos to screen
-- starting from (x,y).
-- Return:
--  - whether we got to bottom of screen before end of line
--  - the final (x,y)
--  - the final pos
--  - starting pos of the final screen line drawn
function Text.draw_wrapping_line(State, line_index, x,y, startpos)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
--?   print('== line', line_index, '^'..line.data..'$')
  local screen_line_starting_pos = startpos
  Text.compute_fragments(State, line_index)
  local pos = 1
  initialize_color()
  for _, f in ipairs(line_cache.fragments) do
    App.color(Text_color)
    local frag, frag_text = f.data, f.text
    select_color(frag)
    local frag_len = utf8.len(frag)
--?     print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)
    if pos < startpos then
      -- render nothing
--?       print('skipping', frag)
    else
      -- render fragment
      local frag_width = App.width(frag_text)
      if x + frag_width > State.right then
        assert(x > State.left)  -- no overfull lines
        y = y + State.line_height
        if y + State.line_height > App.screen.height then
          return --[[screen filled]] true, x,y, pos, screen_line_starting_pos
        end
        screen_line_starting_pos = pos
        x = State.left
        if line_index == State.cursor1.line and State.cursor1.pos == pos then
          Text.draw_cursor(State, x, y)
        end
      end
    end
  else
    x = State.left
  end
  -- check for B side
--?   if line_index == 8 then print('checking for B side') end
  if line.dataB == nil then
    assert(y)
    assert(screen_line_starting_pos)
--?     if line_index == 8 then print('return 1') end
    return y, screen_line_starting_pos
  end
  if not State.expanded and not line.expanded then
    assert(y)
    assert(screen_line_starting_pos)
--?     if line_index == 8 then print('return 2') end
    button(State, 'expand', {x=x+AB_padding, y=y+2, w=App.width(State.em), h=State.line_height-4, color={1,1,1},
      icon = function(button_params)
               App.color(Fold_background_color)
               love.graphics.rectangle('fill', button_params.x, button_params.y, App.width(State.em), State.line_height-4, 2,2)
             end,
      onpress1 = function()
                   line.expanded = true
                 end,
    })
    return y, screen_line_starting_pos
  end
  -- draw B side
--?   if line_index == 8 then print('drawing B side') end
  App.color(Fold_color)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
  line_cache.starty = y
  line_cache.startpos = startpos
  line_cache.startposB = startposB
  -- draw A side
  local overflows_screen, x, pos, screen_line_starting_pos
  if startpos then
    overflows_screen, x, y, pos, screen_line_starting_pos = Text.draw_wrapping_line(State, line_index, State.left, y, startpos)
    if overflows_screen then
      return y, screen_line_starting_pos
    end
    if Focus == 'edit' and State.cursor1.pos then

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[9.2] → [10.165725:165764]

BFD:BFD[10.165764] → [10.152440:152440]

B:BD[10.156342] → [7.239:368]

∅:D[7.368] → [13.21213:21511]

B:BD[13.19888] → [7.199:238]

∅:D[7.238] → [10.155376:155429]

      y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB, hide_cursor)
      y = y + State.line_height
--?       print('=> y', y)
    elseif line.mode == 'drawing' then
      y = y+Drawing_padding_top
      Drawing.draw(State, line_index, y)
      y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom
    else
      print(line.mode)
      assert(false)
function edit.draw(State, hide_cursor)
  State.button_handlers = {}
  App.color(Text_color)

File deletion: source.lua, source.lua

BFD:BFD[9.2] → [10.177652:177686]

BFD:BFD[10.177686] → [10.165766:165766]

B:BD[10.166766] → [14.27:47]

B:BD[10.172847] → [7.370:436]

∅:D[7.436] → [10.172898:173129]

B:BD[10.173129] → [4.12:37]

B:BD[10.175865] → [15.12:42]

B:BD[15.42] → [8.142:177]

∅:D[8.177] → [15.42:59]

B:BD[15.42] → [15.42:59]

∅:D[15.59] → [10.175865:176389]

∅:D[4.37] → [10.173129:173809]

∅:D[14.47] → [10.166766:167316]

B:BD[10.165779] → [5.12:28]

B:BD[10.166514] → [8.36:53]

B:BD[10.166518] → [8.54:141]

∅:D[8.141] → [10.166518:166519]

∅:D[8.53] → [10.166514:166518]

∅:D[5.28] → [10.165779:166025]

B:BD[10.166025] → [8.12:35]

  log_new('source')
  edit.draw(Editor_state, --[[hide cursor?]] Show_file_navigator)
  if Show_log_browser_side then
    -- divider
    App.color(Divider_color)
    love.graphics.rectangle('fill', App.screen.width/2-1,Menu_status_bar_height, 3,App.screen.height)
    --
    log_browser.draw(Log_browser_state)
  end
  source.draw_menu_bar()
  if Show_file_navigator then
    textinput_on_file_navigator(t)
    return
  end
  if Focus == 'edit' then
    return edit.textinput(Editor_state, t)
  else
    return log_browser.textinput(Log_browser_state, t)
  end
end
function source.keychord_pressed(chord, key)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print('source keychord')
  if Show_file_navigator then
    keychord_pressed_on_file_navigator(chord, key)
    return
  end
  if chord == 'C-l' then
--?     print('C-l')
    Show_log_browser_side = not Show_log_browser_side
    if Show_log_browser_side then
end
function source.update(dt)
  Cursor_time = Cursor_time + dt
  if App.mouse_x() < Editor_state.right then
    edit.update(Editor_state, dt)
  elseif Show_log_browser_side then
    log_browser.update(Log_browser_state, dt)
  end
end
function source.quit()
  edit.quit(Editor_state)
  log_browser.quit(Log_browser_state)
  -- convert any bifold files here
end
function source.convert_bifold_text(infilename, outfilename)
  local contents = love.filesystem.read(infilename)
  contents = contents:gsub('\u{1e}', ';')
  love.filesystem.write(outfilename, contents)
end
function source.settings()
  if Current_app == 'source' then
--?     print('reading source window position')
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)
  if Settings and Settings.source then
    source.load_settings()
  else
    source.initialize_default_settings()
  end
  source.initialize_edit_side{'run.lua'}
  source.initialize_log_browser_side()
  Menu_status_bar_height = 5 + Editor_state.line_height + 5
  Editor_state.top = Editor_state.top + Menu_status_bar_height
  Log_browser_state.top = Log_browser_state.top + Menu_status_bar_height
log_render = {}
    filter = '',
  File_navigation.candidates = File_navigation.all_candidates  -- modified with filter
  }
Editor_state = {}
-- called both in tests and real run
function source.initialize_globals()
  -- tests currently mostly clear their own state
  Show_log_browser_side = false
  Focus = 'edit'
  Show_file_navigator = false
  File_navigation = {
    all_candidates = {

File deletion: run.lua, run.lua

BFD:BFD[9.2] → [10.184046:184077]

BFD:BFD[10.184077] → [10.178044:178044]

B:BD[10.178389] → [14.52:69]

∅:D[14.69] → [10.178389:179625]

  log_new('run')
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)
  if Settings then
    run.load_settings()
  else
    run.initialize_default_settings()
  end
  if #arg > 0 then
    Editor_state.filename = arg[1]
    load_from_disk(Editor_state)
    Text.redraw_all(Editor_state)
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
    edit.fixup_cursor(Editor_state)
  else
    load_from_disk(Editor_state)
    Text.redraw_all(Editor_state)
    if Editor_state.cursor1.line > #Editor_state.lines or Editor_state.lines[Editor_state.cursor1.line].mode ~= 'text' then
      edit.fixup_cursor(Editor_state)
    end
  end
  love.window.setTitle('lines.love - '..Editor_state.filename)
  if #arg > 1 then
    print('ignoring commandline args after '..arg[1])
  end
  if rawget(_G, 'jit') then
    jit.off()
    jit.flush()
  end
end
function run.load_settings()
  love.graphics.setFont(love.graphics.newFont(Settings.font_height))
  -- maximize window to determine maximum allowable dimensions
  App.screen.width, App.screen.height, App.screen.flags = love.window.getMode()
  -- set up desired window dimensions

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[9.2] → [10.203223:203262]

BFD:BFD[10.203262] → [10.191782:191782]

B:BD[10.193112] → [3.18:137]

∅:D[18.125] → [19.112:147]

∅:D[3.137] → [19.112:147]

B:BD[19.112] → [19.112:147]

∅:D[18.222] → [19.256:266]

∅:D[3.283] → [19.256:266]

B:BD[19.256] → [19.256:266]

∅:D[19.266] → [10.193219:203222]

B:BD[19.147] → [3.138:283]

      local rest
      line.filename, line.line_number, rest = line.data:match('%[string "([^:]*)"%]:([^:]*):%s*(.*)')
      if line.filename == nil then
      end
      line.filename = guess_source(line.filename)
      line.line_number = tonumber(line.line_number)
      if line.data:sub(1,1) == '{' then
        local data = json.decode(line.data)
        if log_render[data.name] then
          line.data = data
        end
        line.section_stack = table.shallowcopy(Section_stack)
      elseif line.data:match('\u{250c}') then
        line.section_stack = table.shallowcopy(Section_stack)  -- as it is at the beginning
        local section_name = line.data:match('\u{250c}%s*(.*)')
        table.insert(Section_stack, {name=section_name})
        line.section_begin = true
        line.section_name = section_name
        line.data = nil
      elseif line.data:match('\u{2518}') then
        local section_name = line.data:match('\u{2518}%s*(.*)')
        if array.find(Section_stack, function(x) return x.name == section_name end) then
          while table.remove(Section_stack).name ~= section_name do
            --
          end
          line.section_end = true
          line.section_name = section_name
          line.data = nil
        end
        line.section_stack = table.shallowcopy(Section_stack)
      else
        -- string
        line.section_stack = table.shallowcopy(Section_stack)
      end
    else
      line.section_stack = {}
    end
  end
end
function table.shallowcopy(x)
  return {unpack(x)}
end
function guess_source(filename)
  local possible_source = filename:gsub('%.lua$', '%.splua')
  if file_exists(possible_source) then
    return possible_source
  else
    return filename
  end
end
function log_browser.draw(State)
  assert(#State.lines == #State.line_cache)
  local mouse_line_index = log_browser.line_index(State, App.mouse_x(), App.mouse_y())
  local y = State.top
  for line_index = State.screen_top1.line,#State.lines do
    App.color(Text_color)
    local line = State.lines[line_index]
    if y + State.line_height > App.screen.height then break end
    local height = State.line_height
    if should_show(line) then
      local xleft = render_stack_left_margin(State, line_index, line, y)
      local xright = render_stack_right_margin(State, line_index, line, y)
      if line.section_name then
        App.color(Section_border_color)
        local section_text = to_text(line.section_name)
        if line.section_begin then
          local sectiony = y+Section_border_padding_vertical
          love.graphics.line(xleft,sectiony, xleft,y+State.line_height)
          love.graphics.line(xright,sectiony, xright,y+State.line_height)
          love.graphics.line(xleft,sectiony, xleft+50-2,sectiony)
          love.graphics.draw(section_text, xleft+50,y)
          love.graphics.line(xleft+50+App.width(section_text)+2,sectiony, xright,sectiony)
        else assert(line.section_end)
          local sectiony = y+State.line_height-Section_border_padding_vertical
          love.graphics.line(xleft,y, xleft,sectiony)
          love.graphics.line(xright,y, xright,sectiony)
          love.graphics.line(xleft,sectiony, xleft+50-2,sectiony)
          love.graphics.draw(section_text, xleft+50,y)
          love.graphics.line(xleft+50+App.width(section_text)+2,sectiony, xright,sectiony)
        end
      else
        if type(line.data) == 'string' then
          local old_left, old_right = State.left,State.right
          State.left,State.right = xleft,xright
          y = Text.draw(State, line_index, y, --[[startpos]] 1)
          State.left,State.right = old_left,old_right
        else
          height = log_render[line.data.name](line.data, xleft, y, xright-xleft)
        end
      end
      if App.mouse_x() > Log_browser_state.left and line_index == mouse_line_index then
        App.color(Cursor_line_background_color)
        love.graphics.rectangle('fill', xleft,y, xright-xleft, height)
      end
      y = y + height
    end
  end
end
function render_stack_left_margin(State, line_index, line, y)
  if line.section_stack == nil then
    -- assertion message
    for k,v in pairs(line) do
      print(k)
    end
  end
  App.color(Section_border_color)
  for i=1,#line.section_stack do
    local x = State.left + (i-1)*Section_border_padding_horizontal
    love.graphics.line(x,y, x,y+log_browser.height(State, line_index))
    if y < 30 then
      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, y+5, --[[vertically]] math.pi/2)
    end
    if y > App.screen.height-log_browser.height(State, line_index) then
      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-App.width(to_text(line.section_stack[i].name))-5, --[[vertically]] math.pi/2)
    end
  end
  return log_browser.left_margin(State, line)
end
function render_stack_right_margin(State, line_index, line, y)
  App.color(Section_border_color)
  for i=1,#line.section_stack do
    local x = State.right - (i-1)*Section_border_padding_horizontal
    love.graphics.line(x,y, x,y+log_browser.height(State, line_index))
    if y < 30 then
      love.graphics.print(line.section_stack[i].name, x, y+5, --[[vertically]] math.pi/2)
    end
    if y > App.screen.height-log_browser.height(State, line_index) then
      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(to_text(line.section_stack[i].name))-5, --[[vertically]] math.pi/2)
    end
  end
  return log_browser.right_margin(State, line)
end
function should_show(line)
  -- Show a line if every single section it's in is expanded.
  for i=1,#line.section_stack do
    local section = line.section_stack[i]
    if not section.expanded then
      return false
    end
  end
  return true
end
function log_browser.left_margin(State, line)
  return State.left + #line.section_stack*Section_border_padding_horizontal
end
function log_browser.right_margin(State, line)
  return State.right - #line.section_stack*Section_border_padding_horizontal
end
function log_browser.update(State, dt)
end
function log_browser.quit(State)
end
function log_browser.mouse_pressed(State, x,y, mouse_button)
  local line_index = log_browser.line_index(State, x,y)
  if line_index == nil then
    -- below lower margin
    return
  end
  -- leave some space to click without focusing
  local line = State.lines[line_index]
  local xleft = log_browser.left_margin(State, line)
  local xright = log_browser.right_margin(State, line)
  if x < xleft or x > xright then
    return
  end
  -- if it's a section begin/end and the section is collapsed, expand it
  -- TODO: how to collapse?
  if line.section_begin or line.section_end then
    -- HACK: get section reference from next/previous line
    local new_section
    if line.section_begin then
      if line_index < #State.lines then
        local next_section_stack = State.lines[line_index+1].section_stack
        if next_section_stack then
          new_section = next_section_stack[#next_section_stack]
        end
      end
    elseif line.section_end then
      if line_index > 1 then
        local previous_section_stack = State.lines[line_index-1].section_stack
        if previous_section_stack then
          new_section = previous_section_stack[#previous_section_stack]
        end
      end
    end
    if new_section and new_section.expanded == nil then
      new_section.expanded = true
      return
    end
  end
  -- open appropriate file in source side
  if line.filename ~= Editor_state.filename then
    source.switch_to_file(line.filename)
  end
  -- set cursor
  Editor_state.cursor1 = {line=line.line_number, pos=1, posB=nil}
  -- make sure it's visible
  -- TODO: handle extremely long lines
  Editor_state.screen_top1.line = math.max(0, Editor_state.cursor1.line-5)
  -- show cursor
  Focus = 'edit'
  -- expand B side
  Editor_state.expanded = true
end
function log_browser.line_index(State, mx,my)
  -- duplicate some logic from log_browser.draw
  local y = State.top
  for line_index = State.screen_top1.line,#State.lines do
    local line = State.lines[line_index]
    if should_show(line) then
      y = y + log_browser.height(State, line_index)
      if my < y then
        return line_index
      end
      if y > App.screen.height then break end
    end
  end
end
function log_browser.mouse_released(State, x,y, mouse_button)
end
function log_browser.textinput(State, t)
end
function log_browser.keychord_pressed(State, chord, key)
  -- move
  if chord == 'up' then
    while State.screen_top1.line > 1 do
      State.screen_top1.line = State.screen_top1.line-1
      if should_show(State.lines[State.screen_top1.line]) then
        break
      end
    end
  elseif chord == 'down' then
    while State.screen_top1.line < #State.lines do
      State.screen_top1.line = State.screen_top1.line+1
      if should_show(State.lines[State.screen_top1.line]) then
        break
      end
    end
  elseif chord == 'pageup' then
    local y = 0
    while State.screen_top1.line > 1 and y < App.screen.height - 100 do
      State.screen_top1.line = State.screen_top1.line - 1
      if should_show(State.lines[State.screen_top1.line]) then
        y = y + log_browser.height(State, State.screen_top1.line)
      end
    end
  elseif chord == 'pagedown' then
    local y = 0
    while State.screen_top1.line < #State.lines and y < App.screen.height - 100 do
      if should_show(State.lines[State.screen_top1.line]) then
        y = y + log_browser.height(State, State.screen_top1.line)
      end
      State.screen_top1.line = State.screen_top1.line + 1
    end
  end
end
function log_browser.height(State, line_index)
  local line = State.lines[line_index]
  if line.data == nil then
    -- section header
    return State.line_height
  elseif type(line.data) == 'string' then
    return State.line_height
  else
    if line.height == nil then
--?       print('nil line height! rendering off screen to calculate')
      line.height = log_render[line.data.name](line.data, State.left, App.screen.height, State.right-State.left)
    end
    return line.height
  end
end
function log_browser.keyreleased(State, key, scancode)
end
        line.filename, line.line_number, rest = line.data:match('([^:]*):([^:]*):%s*(.*)')
      end
      if rest then
        line.data = rest

File deletion: commands.lua, commands.lua

BFD:BFD[9.2] → [10.207726:207762]

BFD:BFD[10.207762] → [10.204370:204370]

B:BD[10.205905] → [20.29:91]

B:BD[10.206145] → [20.92:133]

B:BD[10.207023] → [21.992:1057]

∅:D[21.1057] → [10.207112:207173]

B:BD[10.207173] → [22.29:65]

B:BD[10.207707] → [22.187:303]

B:BD[22.303] → [5.509:1231]

∅:D[5.1231] → [22.303:309]

B:BD[22.303] → [22.303:309]

B:BD[22.309] → [5.1232:2101]

∅:D[5.2101] → [22.309:1506]

B:BD[22.309] → [22.309:1506]

B:BD[10.207715] → [22.1507:2130]

B:BD[10.207721] → [22.2131:2175]

∅:D[22.2175] → [10.207721:207725]

B:BD[10.207725] → [8.1492:1656]

∅:D[22.2130] → [10.207715:207721]

∅:D[22.1506] → [10.207707:207715]

B:BD[22.65] → [5.405:508]

∅:D[22.186] → [10.207173:207233]

∅:D[5.508] → [10.207173:207233]

B:BD[10.207233] → [8.909:1035]

B:BD[10.207428] → [8.1036:1491]

∅:D[8.1491] → [10.207428:207707]

∅:D[8.1035] → [10.207233:207428]

∅:D[21.808] → [20.134:196]

B:BD[10.206600] → [20.134:196]

B:BD[20.196] → [21.809:905]

B:BD[10.206991] → [6.102:378]

∅:D[6.378] → [10.206991:207023]

B:BD[21.905] → [6.29:67]

∅:D[6.67] → [10.206808:206835]

∅:D[21.905] → [10.206808:206835]

B:BD[10.206835] → [6.68:101]

∅:D[6.101] → [10.206985:206991]

∅:D[23.124] → [10.206985:206991]

∅:D[20.304] → [10.206985:206991]

∅:D[21.991] → [10.206985:206991]

∅:D[24.180] → [25.29:89]

∅:D[21.426] → [25.29:89]

B:BD[10.206542] → [25.29:89]

B:BD[25.89] → [8.364:891]

∅:D[8.891] → [25.89:97]

B:BD[25.89] → [25.89:97]

∅:D[25.97] → [10.206542:206548]

B:BD[10.206548] → [8.892:908]

∅:D[14.196] → [10.206548:206553]

∅:D[8.908] → [10.206548:206553]

B:BD[10.206553] → [5.304:361]

∅:D[5.361] → [21.474:507]

B:BD[21.474] → [21.474:507]

∅:D[26.207] → [21.729:808]

B:BD[21.729] → [21.729:808]

∅:D[5.404] → [26.29:207]

B:BD[21.565] → [26.29:207]

B:BD[21.507] → [5.362:404]

∅:D[20.133] → [10.206193:206277]

B:BD[10.206277] → [8.195:363]

∅:D[8.363] → [21.29:72]

B:BD[10.206277] → [21.29:72]

∅:D[5.142] → [21.142:183]

B:BD[21.142] → [21.142:183]

∅:D[5.303] → [21.315:355]

B:BD[21.315] → [21.315:355]

B:BD[21.183] → [5.143:303]

B:BD[21.72] → [5.46:142]

∅:D[21.355] → [24.29:120]

B:BD[10.206277] → [24.29:120]

∅:D[24.120] → [10.206360:206487]

B:BD[10.206487] → [21.356:426]

∅:D[20.91] → [10.206043:206145]

  local s_text = to_text(s)
  local width = App.width(s_text)
  App.screen.draw(s_text, Menu_cursor,5)
  App.screen.draw(s_text, x,y)
  x = x + width + 30
  return x,y
end
function keychord_pressed_on_file_navigator(chord, key)
  log(2, 'file navigator: '..chord)
    end
  elseif chord == 'down' then
    file_navigator_down()
  elseif chord == 'up' then
    file_navigator_up()
  end
end
function log_render.file_navigator_state(o, x,y, w)
  -- duplicate structure of source.draw_file_navigator
  local num_lines = source.num_lines_for_file_navigator(o.files)
  local h = num_lines * Editor_state.line_height
  App.color(Menu_background_color)
  love.graphics.rectangle('fill', x,y, w,h)
  -- compute the x,y,width of the current index (in offsets from top left)
  local x2,y2 = 0,0
  local width = 0
  for i,filename in ipairs(o.files) do
    local filename_text = to_text(filename)
    width = App.width(filename_text)
    if x2 + width > App.screen.width - 5 then
      y2 = y2 + Editor_state.line_height
      x2 = 0
    end
    if i == o.index then
      break
    end
    x2 = x2 + width + 30
  end
  -- figure out how much of the menu to display
  local menu_xmin = math.max(0, x2-w/2)
  local menu_xmax = math.min(App.screen.width, x2+w/2)
  -- now selectively print out entries
  local x3,y3 = 0,y  -- x3 is relative, y3 is absolute
  local width = 0
  for i,filename in ipairs(o.files) do
    local filename_text = to_text(filename)
    width = App.width(filename_text)
    if x3 + width > App.screen.width - 5 then
      y3 = y3 + Editor_state.line_height
      x3 = 0
    end
    if i == o.index then
      App.color(Menu_highlight_color)
      love.graphics.rectangle('fill', x + x3-menu_xmin - 5, y3-2, width+5*2, Editor_state.line_height+2*2)
    end
    if x3 >= menu_xmin and x3 + width < menu_xmax then
      App.color(Menu_command_color)
      App.screen.draw(filename_text, x + x3-menu_xmin, y3)
    end
    x3 = x3 + width + 30
  end
  --
  return h+20
end
function file_navigator_up()
  local y, x, width = file_coord(File_navigation.index)
  local index = file_index(y-Editor_state.line_height, x, width)
  if index then
    File_navigation.index = index
  end
end
function file_navigator_down()
  local y, x, width = file_coord(File_navigation.index)
  local index = file_index(y+Editor_state.line_height, x, width)
  if index then
    File_navigation.index = index
  end
end
function file_coord(index)
  local y,x = Menu_status_bar_height, 5
  for i,filename in ipairs(File_navigation.candidates) do
    local width = App.width(to_text(filename))
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    end
    if i == index then
    return y, x, width
    end
    x = x + width + 30
  end
end
function file_index(fy, fx, fwidth)
  log_start('file index')
  log(2, ('for %d %d %d'):format(fy, fx, fwidth))
  local y,x = Menu_status_bar_height, 5
  local best_guess, best_guess_x, best_guess_width
  for i,filename in ipairs(File_navigation.candidates) do
    local width = App.width(to_text(filename))
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    if y == fy then
      log(2, ('%d: correct row; considering %d %s %d %d'):format(y, i, filename, x, width))
      if best_guess == nil then
        log(2, 'nil')
        best_guess = i
        best_guess_x = x
        best_guess_width = width
      elseif math.abs(fx + fwidth/2 - x - width/2) < math.abs(fx + fwidth/2 - best_guess_x - best_guess_width/2) then
        best_guess = i
        best_guess_x = x
        best_guess_width = width
      end
      log(2, ('best guess now %d %s %d %d'):format(best_guess, File_navigation.candidates[best_guess], best_guess_x, best_guess_width))
    end
    x = x + width + 30
  log_end('file index')
  return best_guess
end
function textinput_on_file_navigator(t)
  File_navigation.filter = File_navigation.filter..t
  File_navigation.candidates = source.file_navigator_candidates()
end
  end
    end
  log(2, {name='file_navigator_state', files=File_navigation.candidates, index=File_navigation.index})
  if chord == 'escape' then
    Show_file_navigator = false
    File_navigation.index = 1
    File_navigation.filter = ''
    File_navigation.candidates = File_navigation.all_candidates
    File_navigation.index = 1
    File_navigation.filter = ''
    File_navigation.candidates = File_navigation.all_candidates
  elseif chord == 'backspace' then
    local len = utf8.len(File_navigation.filter)
    local byte_offset = Text.offset(File_navigation.filter, len)
    File_navigation.filter = string.sub(File_navigation.filter, 1, byte_offset-1)
    File_navigation.index = 1
    File_navigation.candidates = source.file_navigator_candidates()
  elseif chord == 'left' then
    if File_navigation.index > 1 then
      File_navigation.index = File_navigation.index-1
    end
  elseif chord == 'right' then
    if File_navigation.index < #File_navigation.candidates then
      File_navigation.index = File_navigation.index+1
  elseif chord == 'return' then
    local candidate = guess_source(File_navigation.candidates[File_navigation.index]..'.lua')
    source.switch_to_file(candidate)
    Show_file_navigator = false
  local s_text = to_text(s)
  local width = App.width(s_text)
  if x + width > App.screen.width - 5 then
    y = y + Editor_state.line_height
    x = 5
  end
  button(Editor_state, 'menu', {x=x-5, y=y-2, w=width+5*2, h=Editor_state.line_height+2*2, color=colortable(color),
    onpress1 = function()
      local candidate = guess_source(s..'.lua')
      source.switch_to_file(candidate)
      Show_file_navigator = false
    end
  })
  App.color(Menu_command_color)
  local color = Menu_background_color
  if cursor_highlight then
    color = Menu_highlight_color
  end
    if Menu_cursor >= App.screen.width - 5 then
      break
    end
  end
end
function draw_cursor(x, y)
  -- blink every 0.5s
  if math.floor(Cursor_time*2)%2 == 0 then
    App.color(Cursor_color)
    love.graphics.rectangle('fill', x,y, 3,Editor_state.line_height)
  end
end
function source.file_navigator_candidates()
  if File_navigation.filter == '' then
    return File_navigation.all_candidates
  end
  local result = {}
  for _,filename in ipairs(File_navigation.all_candidates) do
    if starts_with(filename, File_navigation.filter) then
      table.insert(result, filename)
    end
  end
  return result
end
function source.num_lines_for_file_navigator(candidates)
  local result = 1
  local x = 5
  end
  return result
end
function add_file_to_menu(x,y, s, cursor_highlight)
    local width = App.width(to_text(filename))
    if x + width > App.screen.width - 5 then
      result = result+1
      x = 5 + width
    else
      x = x + width + 30
    end
  for i,filename in ipairs(candidates) do
  Menu_cursor = Menu_cursor + width + 30
end
function source.draw_file_navigator()
  App.color(Menu_command_color)
  local filter_text = to_text(File_navigation.filter)
  App.screen.draw(filter_text, 5, 5)
  draw_cursor(5 + App.width(filter_text), 5)
  if File_navigation.num_lines == nil then
  end
  App.color(Menu_background_color)
  local x,y = 5, Menu_status_bar_height
  love.graphics.rectangle('fill', 0,Menu_status_bar_height, App.screen.width, File_navigation.num_lines * Editor_state.line_height + --[[highlight padding]] 2)
    File_navigation.num_lines = source.num_lines_for_file_navigator(File_navigation.candidates)
  for i,filename in ipairs(File_navigation.candidates) do
    if filename == 'source' then
      App.color(Menu_border_color)
      love.graphics.line(Menu_cursor-10,2, Menu_cursor-10,Menu_status_bar_height-2)
    end
    x,y = add_file_to_menu(x,y, filename, i == File_navigation.index)
  if Menu_cursor + width > App.screen.width - 5 then
    return
  end
  App.color(Menu_command_color)

Replacement in source_text.lua at line 7 [27.83786]

B:BD[27.84099] → [27.84099:84161]

function Text.draw(State, line_index, y, startpos, startposB)

[27.84099]

[27.84161]

function Text.draw(State, line_index, y, startpos, startposB, hide_cursor)

Replacement in source_text.lua at line 21 [27.83786]
B:BD[27.84693] → [27.84693:84732]
```
      if State.search_term == nil then
```
[27.84693]
[27.84732]
```
      if not hide_cursor and not State.search_term then
```
Replacement in source_text.lua at line 67 [27.83786]
B:BD[27.86564] → [27.86564:86601]
```
    if State.search_term == nil then
```
[27.86564]
[27.86601]
```
    if not hide_cursor and not State.search_term then
```
Replacement in source_edit.lua at line 127 [27.152503]
∅:D[28.18438] → [27.155413:155439]
B:BD[27.155413] → [27.155413:155439]
```
function edit.draw(State)
```
[28.18438]
[27.155439]
```
function edit.draw(State, hide_cursor)
```

Replacement in source_edit.lua at line 173 [27.152503]

B:BD[27.156405] → [28.19647:19763]

      y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)

[27.156405]

[28.19763]

      y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB, hide_cursor)

Insertion in source.lua at line 2 [27.165829]
[27.165842]
[27.165842]
```
log_render = {}
```
Replacement in source.lua at line 14 [27.165829]
B:BD[27.166088] → [27.166088:166107]
```
    candidates = {
```
[27.166088]
[27.166107]
```
    all_candidates = {
```
Insertion in source.lua at line 47 [27.165829]
[27.166577]
[27.166577]
```
    filter = '',
```

Insertion in source.lua at line 49 [27.165829]

[27.166581]

  File_navigation.candidates = File_navigation.all_candidates  -- modified with filter

Insertion in source.lua at line 62 [27.165829]
[27.166829]
[27.166829]
```
  log_new('source')
```

Replacement in source.lua at line 226 [27.165829]

B:BD[27.172910] → [27.172910:172961]

  source.draw_menu_bar()
  edit.draw(Editor_state)

[27.172910]

[27.172961]

  edit.draw(Editor_state, --[[hide cursor?]] Show_file_navigator)

Insertion in source.lua at line 234 [27.165829]
[27.173192]
[27.173192]
```
  source.draw_menu_bar()
```

Insertion in source.lua at line 311 [27.165829]

[27.175928]

  if Show_file_navigator then
    textinput_on_file_navigator(t)
    return
  end

Deletion in source.lua at line 352 [27.165829]
B:BD[27.177028] → [27.177028:177058]
```
    File_navigation.index = 1
```
Insertion in run.lua at line 18 [27.178107]
[27.178452]
[27.178452]
```
  log_new('run')
```
Deletion in main.lua at line 29 [29.2]
B:BD[27.184750] → [17.29:29]
Resurrecting zombie bytes in main.lua at line 29 [29.2]
B:B[10.184929] → [14.71:92]
BD:B[10.184929] → [14.71:92]
```
  log_new('session')
```
Solving an order conflict in main.lua at line 29 [29.2]
[27.184750]
[14.71]

Replacement in log_browser.lua at line 30 [27.191243]

B:BD[27.192573] → [27.192573:192680]

      line.filename, line.line_number, line.data = line.data:match('%[string "([^:]*)"%]:([^:]*):%s*(.*)')

[27.192573]

[27.192680]

      local rest
      line.filename, line.line_number, rest = line.data:match('%[string "([^:]*)"%]:([^:]*):%s*(.*)')
      if line.filename == nil then
        line.filename, line.line_number, rest = line.data:match('([^:]*):([^:]*):%s*(.*)')
      end
      if rest then
        line.data = rest
      end

Replacement in commands.lua at line 45 [27.203826]

B:BD[27.205361] → [27.205361:205499]

  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  local width = App.width(Text_cache[s])

[27.205361]

[27.205499]

  local s_text = to_text(s)
  local width = App.width(s_text)

Replacement in commands.lua at line 51 [27.203826]
B:BD[27.205601] → [27.205601:205649]
```
  App.screen.draw(Text_cache[s], Menu_cursor,5)
```
[27.205601]
[27.205649]
```
  App.screen.draw(s_text, Menu_cursor,5)
```

Replacement in commands.lua at line 56 [27.203826]

B:BD[27.205733] → [27.205733:205816]

  for i,file in ipairs(File_navigation.candidates) do
    if file == 'source' then

[27.205733]

[27.205816]

  App.color(Menu_command_color)
  local filter_text = to_text(File_navigation.filter)
  App.screen.draw(filter_text, 5, 5)
  draw_cursor(5 + App.width(filter_text), 5)
  if File_navigation.num_lines == nil then
    File_navigation.num_lines = source.num_lines_for_file_navigator(File_navigation.candidates)
  end
  App.color(Menu_background_color)
  love.graphics.rectangle('fill', 0,Menu_status_bar_height, App.screen.width, File_navigation.num_lines * Editor_state.line_height + --[[highlight padding]] 2)
  local x,y = 5, Menu_status_bar_height
  for i,filename in ipairs(File_navigation.candidates) do
    if filename == 'source' then

Replacement in commands.lua at line 71 [27.203826]

B:BD[27.205943] → [27.205943:205998]

    add_file_to_menu(file, i == File_navigation.index)

[27.205943]

[27.205998]

    x,y = add_file_to_menu(x,y, filename, i == File_navigation.index)
    if Menu_cursor >= App.screen.width - 5 then
      break
    end

Replacement in commands.lua at line 78 [27.203826]

B:BD[27.206009] → [27.206009:206147]

function add_file_to_menu(s, cursor_highlight)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)

[27.206009]

[27.206147]

function draw_cursor(x, y)
  -- blink every 0.5s
  if math.floor(Cursor_time*2)%2 == 0 then
    App.color(Cursor_color)
    love.graphics.rectangle('fill', x,y, 3,Editor_state.line_height)

Replacement in commands.lua at line 84 [27.203826]

B:BD[27.206153] → [27.206153:206258]

  local width = App.width(Text_cache[s])
  if Menu_cursor + width > App.screen.width - 5 then
    return

[27.206153]

[27.206258]

end
function source.file_navigator_candidates()
  if File_navigation.filter == '' then
    return File_navigation.all_candidates
  end
  local result = {}
  for _,filename in ipairs(File_navigation.all_candidates) do
    if starts_with(filename, File_navigation.filter) then
      table.insert(result, filename)
    end
  end
  return result
end
function source.num_lines_for_file_navigator(candidates)
  local result = 1
  local x = 5
  for i,filename in ipairs(candidates) do
    local width = App.width(to_text(filename))
    if x + width > App.screen.width - 5 then
      result = result+1
      x = 5 + width
    else
      x = x + width + 30
    end
  end
  return result
end
function add_file_to_menu(x,y, s, cursor_highlight)
  local s_text = to_text(s)
  local width = App.width(s_text)
  if x + width > App.screen.width - 5 then
    y = y + Editor_state.line_height
    x = 5

Insertion in commands.lua at line 121 [27.203826]
[27.206264]
[27.206264]
```
  local color = Menu_background_color
```

Replacement in commands.lua at line 123 [27.203826]

B:BD[27.206291] → [27.206291:206441]

    App.color(Menu_highlight_color)
    love.graphics.rectangle('fill', Menu_cursor-5,5-2, App.width(Text_cache[s])+5*2,Editor_state.line_height+2*2)

[27.206291]

[27.206441]

    color = Menu_highlight_color

Insertion in commands.lua at line 125 [27.203826]

[27.206447]

  button(Editor_state, 'menu', {x=x-5, y=y-2, w=width+5*2, h=Editor_state.line_height+2*2, color=colortable(color),
    onpress1 = function()
      local candidate = guess_source(s..'.lua')
      source.switch_to_file(candidate)
      Show_file_navigator = false
    end
  })

Replacement in commands.lua at line 133 [27.203826]

B:BD[27.206479] → [27.206479:206568]

  App.screen.draw(Text_cache[s], Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30

[27.206479]

[27.206568]

  App.screen.draw(s_text, x,y)
  x = x + width + 30
  return x,y

Insertion in commands.lua at line 139 [27.203826]

[27.206629]

  log(2, 'file navigator: '..chord)
  log(2, {name='file_navigator_state', files=File_navigation.candidates, index=File_navigation.index})

Insertion in commands.lua at line 143 [27.203826]

[27.206689]

    File_navigation.index = 1
    File_navigation.filter = ''
    File_navigation.candidates = File_navigation.all_candidates

Insertion in commands.lua at line 150 [27.203826]

[27.206884]

    File_navigation.index = 1
    File_navigation.filter = ''
    File_navigation.candidates = File_navigation.all_candidates
  elseif chord == 'backspace' then
    local len = utf8.len(File_navigation.filter)
    local byte_offset = Text.offset(File_navigation.filter, len)
    File_navigation.filter = string.sub(File_navigation.filter, 1, byte_offset-1)
    File_navigation.index = 1
    File_navigation.candidates = source.file_navigator_candidates()

Insertion in commands.lua at line 167 [27.203826]

[27.207171]

  elseif chord == 'down' then
    file_navigator_down()
  elseif chord == 'up' then
    file_navigator_up()

Insertion in commands.lua at line 173 [27.203826]

[27.207181]


function log_render.file_navigator_state(o, x,y, w)
  -- duplicate structure of source.draw_file_navigator
  local num_lines = source.num_lines_for_file_navigator(o.files)
  local h = num_lines * Editor_state.line_height
  App.color(Menu_background_color)
  love.graphics.rectangle('fill', x,y, w,h)
  -- compute the x,y,width of the current index (in offsets from top left)
  local x2,y2 = 0,0
  local width = 0
  for i,filename in ipairs(o.files) do
    local filename_text = to_text(filename)
    width = App.width(filename_text)
    if x2 + width > App.screen.width - 5 then
      y2 = y2 + Editor_state.line_height
      x2 = 0
    end
    if i == o.index then
      break
    end
    x2 = x2 + width + 30
  end
  -- figure out how much of the menu to display
  local menu_xmin = math.max(0, x2-w/2)
  local menu_xmax = math.min(App.screen.width, x2+w/2)
  -- now selectively print out entries
  local x3,y3 = 0,y  -- x3 is relative, y3 is absolute
  local width = 0
  for i,filename in ipairs(o.files) do
    local filename_text = to_text(filename)
    width = App.width(filename_text)
    if x3 + width > App.screen.width - 5 then
      y3 = y3 + Editor_state.line_height
      x3 = 0
    end
    if i == o.index then
      App.color(Menu_highlight_color)
      love.graphics.rectangle('fill', x + x3-menu_xmin - 5, y3-2, width+5*2, Editor_state.line_height+2*2)
    end
    if x3 >= menu_xmin and x3 + width < menu_xmax then
      App.color(Menu_command_color)
      App.screen.draw(filename_text, x + x3-menu_xmin, y3)
    end
    x3 = x3 + width + 30
  end
  --
  return h+20
end
function file_navigator_up()
  local y, x, width = file_coord(File_navigation.index)
  local index = file_index(y-Editor_state.line_height, x, width)
  if index then
    File_navigation.index = index
  end
end
function file_navigator_down()
  local y, x, width = file_coord(File_navigation.index)
  local index = file_index(y+Editor_state.line_height, x, width)
  if index then
    File_navigation.index = index
  end
end
function file_coord(index)
  local y,x = Menu_status_bar_height, 5
  for i,filename in ipairs(File_navigation.candidates) do
    local width = App.width(to_text(filename))
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    end
    if i == index then
    return y, x, width
    end
    x = x + width + 30
  end
end
function file_index(fy, fx, fwidth)
  log_start('file index')
  log(2, ('for %d %d %d'):format(fy, fx, fwidth))
  local y,x = Menu_status_bar_height, 5
  local best_guess, best_guess_x, best_guess_width
  for i,filename in ipairs(File_navigation.candidates) do
    local width = App.width(to_text(filename))
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    end
    if y == fy then
      log(2, ('%d: correct row; considering %d %s %d %d'):format(y, i, filename, x, width))
      if best_guess == nil then
        log(2, 'nil')
        best_guess = i
        best_guess_x = x
        best_guess_width = width
      elseif math.abs(fx + fwidth/2 - x - width/2) < math.abs(fx + fwidth/2 - best_guess_x - best_guess_width/2) then
        best_guess = i
        best_guess_x = x
        best_guess_width = width
      end
      log(2, ('best guess now %d %s %d %d'):format(best_guess, File_navigation.candidates[best_guess], best_guess_x, best_guess_width))
    end
    x = x + width + 30
  end
  log_end('file index')
  return best_guess
end
function textinput_on_file_navigator(t)
  File_navigation.filter = File_navigation.filter..t
  File_navigation.candidates = source.file_navigator_candidates()
end

Merge lines.love

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

File deletion: commands.lua, commands.lua

Replacement in source_text.lua at line 7 [27.83786]

Replacement in source_text.lua at line 21 [27.83786]

Replacement in source_text.lua at line 67 [27.83786]

Replacement in source_edit.lua at line 127 [27.152503]

Replacement in source_edit.lua at line 173 [27.152503]

Insertion in source.lua at line 2 [27.165829]

Replacement in source.lua at line 14 [27.165829]

Insertion in source.lua at line 47 [27.165829]

Insertion in source.lua at line 49 [27.165829]

Insertion in source.lua at line 62 [27.165829]

Replacement in source.lua at line 226 [27.165829]

Insertion in source.lua at line 234 [27.165829]

Insertion in source.lua at line 311 [27.165829]

Deletion in source.lua at line 352 [27.165829]

Insertion in run.lua at line 18 [27.178107]

Deletion in main.lua at line 29 [29.2]

Resurrecting zombie bytes in main.lua at line 29 [29.2]

Solving an order conflict in main.lua at line 29 [29.2]