akkartik/pong.love - Change EWQEFSZQN6JAJVENZMUKCUEB25GUE23U6DYSBNFNLB2NVUUDQ7ZQC

Merge text.love

Created by Kartik K. Agaram on September 19, 2022

EWQEFSZQN6JAJVENZMUKCUEB25GUE23U6DYSBNFNLB2NVUUDQ7ZQC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[4.2] → [5.177715:177749]

BFD:BFD[5.177749] → [5.165829:165829]

B:BD[5.174901] → [3.2681:2899]

∅:D[3.2899] → [6.23378:23426]

B:BD[5.174465] → [3.2607:2680]

∅:D[3.2680] → [5.174558:174901]

B:BD[5.174269] → [3.2486:2606]

∅:D[3.2606] → [5.174269:174465]

B:BD[5.172796] → [3.2192:2485]

∅:D[3.2485] → [5.172882:172910]

B:BD[5.172660] → [3.2045:2191]

∅:D[3.2191] → [5.172660:172796]

B:BD[5.170346] → [3.2008:2044]

∅:D[3.2044] → [5.170346:170546]

B:BD[5.169706] → [3.1479:2007]

∅:D[3.2007] → [5.169796:170346]

B:BD[5.167543] → [3.1140:1478]

∅:D[3.1478] → [5.167706:167796]

B:BD[5.167102] → [3.1107:1139]

∅:D[3.1139] → [5.167143:167379]

B:BD[7.428] → [3.1051:1106]

∅:D[3.1106] → [5.166577:166581]

  if Show_file_navigator and y < Menu_status_bar_height + File_navigation.num_lines * Editor_state.line_height then
    -- send click to buttons
    edit.mouse_pressed(Editor_state, x,y, mouse_button)
    return
  end
  if x < Editor_state.right + Margin_right then
    filename=Editor_state.filename,
    cursors=File_navigation.cursors,
    show_log_browser_side=Show_log_browser_side,
    focus=Focus,
  }
end
function source.mouse_pressed(x,y, mouse_button)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print('mouse click', x, y)
--?   print(Editor_state.left, Editor_state.right)
--?   print(Log_browser_state.left, Log_browser_state.right)
  File_navigation.cursors[Editor_state.filename] = {cursor1=Editor_state.cursor1, screen_top1=Editor_state.screen_top1}
  return {
    x=Settings.source.x, y=Settings.source.y, displayindex=Settings.source.displayindex,
    width=App.screen.width, height=App.screen.height,
    font_height=Editor_state.font_height,
  if File_navigation.cursors[filename] then
    Editor_state.screen_top1 = File_navigation.cursors[filename].screen_top1
    Editor_state.cursor1 = File_navigation.cursors[filename].cursor1
  else
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
  end
end
function source.draw()
  -- save cursor position
  File_navigation.cursors[Editor_state.filename] = {cursor1=Editor_state.cursor1, screen_top1=Editor_state.screen_top1}
  -- clear the slate for the new file
  Editor_state.filename = filename
  load_from_disk(Editor_state)
  Text.redraw_all(Editor_state)
  Editor_state.filename = 'run.lua'
  Editor_state.font_height = font_height
  Editor_state.line_height = math.floor(font_height*1.3)
  Editor_state.em = em
end
function source.initialize_window_geometry(em_width)
  -- maximize window
  Editor_state.filename = basename(Editor_state.filename)  -- migrate settings that used full paths; we now support only relative paths within the app
  if settings.cursors then
    File_navigation.cursors = settings.cursors
    Editor_state.screen_top1 = File_navigation.cursors[Editor_state.filename].screen_top1
    Editor_state.cursor1 = File_navigation.cursors[Editor_state.filename].cursor1
  else
    -- migrate old settings
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
  end
end
function source.set_window_position_from_settings(settings)
  -- setPosition doesn't quite seem to do what is asked of it on Linux.
  love.window.setPosition(settings.x, settings.y-37, settings.displayindex)
end
function source.initialize_default_settings()
  local font_height = 20
  love.graphics.setFont(love.graphics.newFont(font_height))
  local em = App.newText(love.graphics.getFont(), 'm')
  source.initialize_window_geometry(App.width(em))
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
function source.initialize_edit_side()
  load_from_disk(Editor_state)
  Text.redraw_all(Editor_state)
  if File_navigation.cursors[Editor_state.filename] then
    Editor_state.screen_top1 = File_navigation.cursors[Editor_state.filename].screen_top1
    Editor_state.cursor1 = File_navigation.cursors[Editor_state.filename].cursor1
  else
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
  source.initialize_edit_side()
  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
    cursors = {},  -- filename to cursor1, screen_top1
  }

File deletion: commands.lua, commands.lua

BFD:BFD[4.2] → [5.207182:207218]

BFD:BFD[5.207218] → [5.203826:203826]

B:BD[5.206721] → [3.3553:3625]

∅:D[3.3625] → [7.3834:4163]

B:BD[5.206657] → [3.3525:3552]

∅:D[3.3552] → [5.206689:206721]

B:BD[5.206573] → [3.2944:3524]

∅:D[3.3524] → [5.206573:206629]

B:BD[7.3240] → [3.2917:2943]

∅:D[3.2943] → [7.3361:3374]

    navigate_to_file(File_navigation.candidates[File_navigation.index])
  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()
    reset_file_navigator()
  elseif chord == 'return' then
function navigate_to_file(s)
  move_candidate_to_front(s)
  local candidate = guess_source(s..'.lua')
  source.switch_to_file(candidate)
  reset_file_navigator()
end
function move_candidate_to_front(s)
  local index = array.find(File_navigation.all_candidates, s)
  assert(index)
  table.remove(File_navigation.all_candidates, index)
  table.insert(File_navigation.all_candidates, 1, s)
end
function reset_file_navigator()
  Show_file_navigator = false
  File_navigation.index = 1
  File_navigation.filter = ''
  File_navigation.candidates = File_navigation.all_candidates
end
function keychord_pressed_on_file_navigator(chord, key)
      navigate_to_file(s)
    end
  })

Insertion in source.lua at line 42 [9.5]

[2.301]

[8.276]

    cursors = {},  -- filename to cursor1, screen_top1

Replacement in source.lua at line 69 [9.5]
B:BD[9.790] → [10.5:49]
```
  source.initialize_edit_side{'pong.splua'}
```
[9.790]
[11.52]
```
  source.initialize_edit_side()
```

Replacement in source.lua at line 80 [9.5]

B:BD[9.2409] → [12.358:400]

∅:D[12.400] → [9.2451:2572]

B:BD[9.2451] → [9.2451:2572]

function source.initialize_edit_side(arg)
  if #arg > 0 then
    Editor_state.filename = arg[1]
    load_from_disk(Editor_state)
    Text.redraw_all(Editor_state)

[9.2409]

[9.2572]

function source.initialize_edit_side()
  load_from_disk(Editor_state)
  Text.redraw_all(Editor_state)
  if File_navigation.cursors[Editor_state.filename] then
    Editor_state.screen_top1 = File_navigation.cursors[Editor_state.filename].screen_top1
    Editor_state.cursor1 = File_navigation.cursors[Editor_state.filename].cursor1
  else

Deletion in source.lua at line 89 [9.5]

B:BD[9.2662] → [9.2662:2816]

  else
    load_from_disk(Editor_state)
    Text.redraw_all(Editor_state)
  end
  if #arg > 1 then
    print('ignoring commandline args after '..arg[1])

Replacement in source.lua at line 131 [9.5]

B:BD[9.4287] → [9.4287:4377]

  Editor_state.screen_top1 = settings.screen_top
  Editor_state.cursor1 = settings.cursor

[9.4287]

[9.4377]

  Editor_state.filename = basename(Editor_state.filename)  -- migrate settings that used full paths; we now support only relative paths within the app
  if settings.cursors then
    File_navigation.cursors = settings.cursors
    Editor_state.screen_top1 = File_navigation.cursors[Editor_state.filename].screen_top1
    Editor_state.cursor1 = File_navigation.cursors[Editor_state.filename].cursor1
  else
    -- migrate old settings
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
  end

Insertion in source.lua at line 154 [9.5]
[9.4714]
[9.4714]
```
  Editor_state.filename = 'pong.splua'
```

Insertion in source.lua at line 216 [9.5]

[9.6599]

  -- save cursor position
  File_navigation.cursors[Editor_state.filename] = {cursor1=Editor_state.cursor1, screen_top1=Editor_state.screen_top1}

Replacement in source.lua at line 222 [9.5]

B:BD[9.6735] → [9.6735:6821]

  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.cursor1 = {line=1, pos=1}

[9.6735]

[9.6821]

  if File_navigation.cursors[filename] then
    Editor_state.screen_top1 = File_navigation.cursors[filename].screen_top1
    Editor_state.cursor1 = File_navigation.cursors[filename].cursor1
  else
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
  end

Deletion in source.lua at line 268 [9.5]

∅:D[13.4879] → [14.505:511]

B:BD[14.505] → [14.505:511]

∅:D[14.511] → [9.7858:7899]

B:BD[9.7858] → [9.7858:7899]

B:BD[9.7899] → [15.9:150]

  end
  local filename = Editor_state.filename
  if is_relative_path(filename) then
    filename = love.filesystem.getWorkingDirectory()..'/'..filename  -- '/' should work even on Windows

Insertion in source.lua at line 270 [9.5]

[16.361]

[17.114]

  File_navigation.cursors[Editor_state.filename] = {cursor1=Editor_state.cursor1, screen_top1=Editor_state.screen_top1}

Replacement in source.lua at line 275 [9.5]

B:BD[9.8202] → [9.8202:8225]

B:BD[9.8225] → [17.126:196]

    filename=filename,
    screen_top=Editor_state.screen_top1, cursor=Editor_state.cursor1,

[9.8202]

[11.259]

    filename=Editor_state.filename,
    cursors=File_navigation.cursors,

Insertion in source.lua at line 287 [9.5]

[9.8625]

[18.157006]

  if Show_file_navigator and y < Menu_status_bar_height + File_navigation.num_lines * Editor_state.line_height then
    -- send click to buttons
    edit.mouse_pressed(Editor_state, x,y, mouse_button)
    return
  end

Deletion in commands.lua at line 67 [19.459]

B:BD[2.1647] → [2.1647:1680]

∅:D[2.1680] → [20.47:174]

B:BD[20.47] → [20.47:174]

    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

Replacement in commands.lua at line 123 [19.459]

B:BD[2.3115] → [2.3115:3236]

      local candidate = guess_source(s..'.lua')
      source.switch_to_file(candidate)
      Show_file_navigator = false

[2.3115]

[2.3236]

      navigate_to_file(s)

Insertion in commands.lua at line 132 [19.459]

[8.1349]

function navigate_to_file(s)
  move_candidate_to_front(s)
  local candidate = guess_source(s..'.lua')
  source.switch_to_file(candidate)
  reset_file_navigator()
end
function move_candidate_to_front(s)
  local index = array.find(File_navigation.all_candidates, s)
  assert(index)
  table.remove(File_navigation.all_candidates, index)
  table.insert(File_navigation.all_candidates, 1, s)
end
function reset_file_navigator()
  Show_file_navigator = false
  File_navigation.index = 1
  File_navigation.filter = ''
  File_navigation.candidates = File_navigation.all_candidates
end

Replacement in commands.lua at line 157 [19.459]

B:BD[8.1433] → [8.1433:1465]

B:BD[8.1465] → [2.3456:3582]

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

[8.1433]

[8.1465]

    reset_file_navigator()

Replacement in commands.lua at line 159 [19.459]

B:BD[8.1497] → [8.1497:1660]

B:BD[8.1660] → [2.3583:3709]

    local candidate = guess_source(File_navigation.candidates[File_navigation.index]..'.lua')
    source.switch_to_file(candidate)
    Show_file_navigator = false
    File_navigation.index = 1
    File_navigation.filter = ''
    File_navigation.candidates = File_navigation.all_candidates

[8.1497]

[2.3709]

    navigate_to_file(File_navigation.candidates[File_navigation.index])