akkartik/pong.love - Change 5E7BBR7HWGOEJJ6YWPL3NJKZVBTUZWET7OQNCRU2MMNVEGCEIAWQC

Merge text.love

Created by Kartik K. Agaram on September 18, 2022

5E7BBR7HWGOEJJ6YWPL3NJKZVBTUZWET7OQNCRU2MMNVEGCEIAWQC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[7.2] → [8.177715:177749]

BFD:BFD[8.177749] → [8.165829:165829]

B:BD[8.175928] → [6.631:713]

∅:D[6.713] → [8.175928:176452]

B:BD[8.173192] → [6.605:630]

∅:D[6.630] → [8.173192:173872]

B:BD[8.172910] → [6.538:604]

∅:D[6.604] → [8.172961:173192]

B:BD[8.166829] → [6.517:537]

∅:D[6.537] → [8.166829:167379]

B:BD[8.166581] → [6.429:516]

∅:D[6.516] → [8.166581:166582]

B:BD[8.166577] → [6.411:428]

∅:D[6.428] → [8.166577:166581]

B:BD[8.166088] → [6.387:410]

∅:D[6.410] → [8.166107:166166]

B:BD[8.165842] → [6.370:386]

∅:D[6.386] → [8.165842:166088]

  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
  source.draw_menu_bar()
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')
  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
  log_new('source')
  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
  File_navigation.candidates = File_navigation.all_candidates  -- modified with filter
    filter = '',
  }
    all_candidates = {
      'run',
      'run_tests',
      'log',
      'edit',
log_render = {}
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 = {

File deletion: run.lua, run.lua

BFD:BFD[7.2] → [8.183867:183898]

BFD:BFD[8.183898] → [8.178107:178107]

B:BD[8.178452] → [6.718:735]

∅:D[6.735] → [8.178452:179481]

  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}
  else
    load_from_disk(Editor_state)
    Text.redraw_all(Editor_state)
  end
  love.window.setTitle('text.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[7.2] → [8.202684:202723]

BFD:BFD[8.202723] → [8.191243:191243]

B:BD[8.192573] → [6.740:1049]

∅:D[6.1049] → [8.192680:202683]

      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
      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

File deletion: commands.lua, commands.lua

BFD:BFD[7.2] → [8.207182:207218]

BFD:BFD[8.207218] → [8.203826:203826]

B:BD[8.207181] → [6.4273:7906]

B:BD[8.207171] → [6.4164:4272]

∅:D[6.4272] → [8.207171:207181]

B:BD[8.206884] → [6.3708:4163]

∅:D[6.4163] → [8.206884:207171]

B:BD[8.206689] → [6.3581:3707]

∅:D[6.3707] → [8.206689:206884]

B:BD[8.206629] → [6.3441:3580]

∅:D[6.3580] → [8.206629:206689]

B:BD[8.206479] → [6.3375:3440]

∅:D[6.3440] → [8.206568:206629]

B:BD[8.206447] → [6.3098:3374]

∅:D[6.3374] → [8.206447:206479]

B:BD[8.206291] → [6.3064:3097]

∅:D[6.3097] → [8.206441:206447]

B:BD[8.206264] → [6.3025:3063]

∅:D[6.3063] → [8.206264:206291]

B:BD[8.206153] → [6.2135:3024]

∅:D[6.3024] → [8.206258:206264]

B:BD[8.206009] → [6.1945:2134]

∅:D[6.2134] → [8.206147:206153]

B:BD[8.205943] → [6.1806:1944]

∅:D[6.1944] → [8.205998:206009]

B:BD[8.205733] → [6.1166:1805]

∅:D[6.1805] → [8.205816:205943]

B:BD[8.205601] → [6.1124:1165]

∅:D[6.1165] → [8.205649:205733]

B:BD[8.205361] → [6.1061:1123]

∅:D[6.1123] → [8.205499:205601]


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
  elseif chord == 'down' then
    file_navigator_down()
  elseif chord == 'up' then
    file_navigator_up()
  end
end
    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
    end
    File_navigation.index = 1
    File_navigation.filter = ''
    File_navigation.candidates = File_navigation.all_candidates
  elseif chord == 'return' then
    local candidate = guess_source(File_navigation.candidates[File_navigation.index]..'.lua')
    source.switch_to_file(candidate)
    Show_file_navigator = false
  log(2, 'file navigator: '..chord)
  log(2, {name='file_navigator_state', files=File_navigation.candidates, index=File_navigation.index})
  if chord == 'escape' then
    Show_file_navigator = false
  App.screen.draw(s_text, x,y)
  x = x + width + 30
  return x,y
end
function keychord_pressed_on_file_navigator(chord, key)
  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)
    color = Menu_highlight_color
  end
  local color = Menu_background_color
  if cursor_highlight then
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
  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
    x,y = add_file_to_menu(x,y, filename, i == File_navigation.index)
    if Menu_cursor >= App.screen.width - 5 then
      break
    end
  end
end
  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
      App.color(Menu_border_color)
      love.graphics.line(Menu_cursor-10,2, Menu_cursor-10,Menu_status_bar_height-2)
    end
  App.screen.draw(s_text, Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30
end
function source.draw_file_navigator()
  local s_text = to_text(s)
  local width = App.width(s_text)
  if Menu_cursor + width > App.screen.width - 5 then
    return
  end
  App.color(Menu_command_color)

Replacement in source_text.lua at line 7 [8.83786]

B:BD[11.83822] → [11.83822:83884]

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

[11.83822]

[11.83884]

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

Replacement in source_text.lua at line 21 [8.83786]

B:BD[11.84416] → [11.84416:84455]

      if State.search_term == nil then

[11.84416]

[11.84455]

      if not hide_cursor and not State.search_term then

Replacement in source_text.lua at line 67 [8.83786]
B:BD[11.86133] → [11.86133:86170]
```
    if State.search_term == nil then
```
[11.86133]
[11.86170]
```
    if not hide_cursor and not State.search_term then
```
Deletion in source_text.lua at line 218 [8.83786]
B:BD[11.91117] → [4.16850:16850]
B:BD[8.84099] → [6.7:82]
BD:BD[8.84099] → [6.7:82]
B:BD[8.84693] → [6.83:139]
BD:BD[8.84693] → [6.83:139]
B:BD[8.86564] → [6.140:194]
BD:BD[8.86564] → [6.140:194]
```
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
```
Solving an order conflict in source_text.lua at line 218 [8.83786]
[11.91117]
[12.3883]
Replacement in source_edit.lua at line 127 [8.152503]
B:BD[12.18438] → [11.147363:147389]
```
function edit.draw(State)
```
[12.18438]
[11.147389]
```
function edit.draw(State, hide_cursor)
```
Deletion in source_edit.lua at line 144 [8.152503]
B:BD[11.147897] → [13.4250:4250]
B:BD[12.18438] → [6.199:238]
BD:BD[12.18438] → [6.199:238]
```
function edit.draw(State, hide_cursor)
```
Solving an order conflict in source_edit.lua at line 144 [8.152503]
[11.147897]
[12.18439]
Resurrecting zombie bytes in source_edit.lua at line 172 [8.152503]
B:B[12.19646] → [11.148070:148080]
BD:B[12.19646] → [11.148070:148080]
```
      end
```
Deletion in source_edit.lua at line 173 [8.152503]
∅:D[11.148080] → [12.19647:19763]
B:BD[8.156405] → [12.19647:19763]
BD:BD[8.156405] → [12.19647:19763]
```
      y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)
```

Resurrecting zombie bytes in source_edit.lua at line 173 [8.152503]

B:B[8.156405] → [6.239:368]

BD:B[8.156405] → [6.239:368]

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

Solving an order conflict in source_edit.lua at line 173 [8.152503]
[11.148080]
[6.239]

Resurrecting zombie bytes in source_edit.lua at line 174 [8.152503]

∅:∅[6.368] → [12.19763:20061]

B:B[12.19763] → [12.19763:20061]

BD:B[12.19763] → [12.19763:20061]

      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)

Insertion in source.lua at line 2 [14.5]
[14.18]
[14.18]
```
log_render = {}
```
Replacement in source.lua at line 14 [14.5]
B:BD[15.57] → [15.57:76]
```
    candidates = {
```
[15.57]
[15.76]
```
    all_candidates = {
```
Insertion in source.lua at line 41 [14.5]
[15.276]
[15.276]
```
    filter = '',
```

Insertion in source.lua at line 43 [14.5]

[15.280]

[16.5]

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

Insertion in source.lua at line 56 [14.5]
[17.34]
[14.512]
```
  log_new('source')
```
Replacement in source.lua at line 220 [14.5]
B:BD[14.6849] → [16.258:283]
∅:D[16.283] → [18.74:100]
B:BD[14.6849] → [18.74:100]
```
  source.draw_menu_bar()
  edit.draw(Editor_state)
```
[14.6849]
[18.100]
```
  edit.draw(Editor_state, --[[hide cursor?]] Show_file_navigator)
```
Insertion in source.lua at line 228 [14.5]
[14.7129]
[14.7129]
```
  source.draw_menu_bar()
```

Insertion in source.lua at line 305 [14.5]

[14.9601]

[19.705]

  if Show_file_navigator then
    textinput_on_file_navigator(t)
    return
  end

Deletion in source.lua at line 345 [14.5]
B:BD[15.453] → [15.453:483]
```
    File_navigation.index = 1
```
Insertion in main.lua at line 29 [21.2]
[20.200]
[20.200]
```
  log_new('session')
```
Deletion in main.lua at line 250 [21.2]
B:BD[8.190716] → [11.157471:157471]
B:BD[8.184750] → [6.738:738]
BD:BD[8.184750] → [6.738:738]
BD:BD[8.184750] → [6.738:738]
∅:D[6.738] → [22.71:92]
B:BD[23.184929] → [22.71:92]
BD:BD[23.184929] → [22.71:92]
```
  log_new('session')
```
Solving an order conflict in main.lua at line 250 [21.2]
[8.190716]

Replacement in log_browser.lua at line 30 [25.5]

B:BD[24.40] → [2.12:119]

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

[24.40]

[24.134]

      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 [16.459]

B:BD[16.1869] → [15.624:762]

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

[16.1869]

[15.762]

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

Replacement in commands.lua at line 51 [16.459]

B:BD[15.864] → [15.864:912]

  App.screen.draw(Text_cache[s], Menu_cursor,5)

[15.864]

[15.912]

  App.screen.draw(s_text, Menu_cursor,5)

Replacement in commands.lua at line 56 [16.459]

B:BD[15.996] → [15.996:1050]

B:BD[15.1050] → [3.18:47]

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

[15.996]

[3.47]

  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 [16.459]

∅:D[3.174] → [15.1050:1105]

B:BD[15.1050] → [15.1050:1105]

    add_file_to_menu(file, i == File_navigation.index)

[3.174]

[15.1105]

    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 [16.459]

B:BD[15.1116] → [15.1116:1163]

∅:D[15.1163] → [16.1869:1960]

B:BD[16.1869] → [16.1869:1960]

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

[15.1116]

[16.1960]

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 [16.459]

B:BD[16.1966] → [16.1966:2071]

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

[16.1966]

[15.1164]

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 [16.459]
[15.1170]
[15.1170]
```
  local color = Menu_background_color
```

Replacement in commands.lua at line 123 [16.459]

B:BD[15.1197] → [15.1197:1347]

    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)

[15.1197]

[16.2071]

    color = Menu_highlight_color

Insertion in commands.lua at line 125 [16.459]

[16.2077]

  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 [16.459]

B:BD[16.2109] → [16.2109:2198]

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

[16.2109]

[16.2198]

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

Insertion in commands.lua at line 139 [16.459]

[15.1405]

  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 [16.459]

[15.1465]

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

Insertion in commands.lua at line 150 [16.459]

[15.1660]

    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 [16.459]

[15.1947]

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

Insertion in commands.lua at line 173 [16.459]

[15.1957]


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 text.love

Dependencies

In channels

Change contents

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 [8.83786]

Replacement in source_text.lua at line 21 [8.83786]

Replacement in source_text.lua at line 67 [8.83786]

Deletion in source_text.lua at line 218 [8.83786]

Solving an order conflict in source_text.lua at line 218 [8.83786]

Replacement in source_edit.lua at line 127 [8.152503]

Deletion in source_edit.lua at line 144 [8.152503]

Solving an order conflict in source_edit.lua at line 144 [8.152503]

Resurrecting zombie bytes in source_edit.lua at line 172 [8.152503]

Deletion in source_edit.lua at line 173 [8.152503]

Resurrecting zombie bytes in source_edit.lua at line 173 [8.152503]

Solving an order conflict in source_edit.lua at line 173 [8.152503]

Resurrecting zombie bytes in source_edit.lua at line 174 [8.152503]

Insertion in source.lua at line 2 [14.5]

Replacement in source.lua at line 14 [14.5]

Insertion in source.lua at line 41 [14.5]

Insertion in source.lua at line 43 [14.5]

Insertion in source.lua at line 56 [14.5]

Replacement in source.lua at line 220 [14.5]

Insertion in source.lua at line 228 [14.5]