akkartik/carousel.love - Change ATQO62TFDZ7J4RCOSB3K2QCCB5R6PNYQIIGNXTLZMEFG5UG5PUJQC

Merge lines.love

Created by Kartik K. Agaram on September 19, 2022

ATQO62TFDZ7J4RCOSB3K2QCCB5R6PNYQIIGNXTLZMEFG5UG5PUJQC

Dependencies

In channels

main

Change contents

File deletion: source_file.lua, source_file.lua

BFD:BFD[8.2] → [9.152399:152438]

BFD:BFD[9.152438] → [9.150241:150241]

B:BD[11.503] → [7.963:1048]

B:BD[11.499] → [7.10:962]

∅:D[7.962] → [11.499:503]


function empty(h)
  for _,_ in pairs(h) do
    return false
  end
  return true
end
end
function dirname(path)
  local os_path_separator = package.config:sub(1,1)
  if os_path_separator == '/' then
    -- POSIX systems permit backslashes in filenames
    return path:match('.*/') or './'
  elseif os_path_separator == '\\' then
    return path:match('.*[/\\]') or './'
  else
    error('What OS is this? LÖVE reports that the path separator is "'..os_path_separator..'"')
  end
end
function test_dirname()
  check_eq(dirname('a/b'), 'a/', 'F - test_dirname')
  check_eq(dirname('x'), './', 'F - test_dirname/current')
end
function basename(path)
  local os_path_separator = package.config:sub(1,1)
  if os_path_separator == '/' then
    -- POSIX systems permit backslashes in filenames
    return string.gsub(path, ".*/(.*)", "%1")
  elseif os_path_separator == '\\' then
    return string.gsub(path, ".*[/\\](.*)", "%1")
  else
    error('What OS is this? LÖVE reports that the path separator is "'..os_path_separator..'"')
  end
end

File deletion: source.lua, source.lua

BFD:BFD[8.2] → [9.177652:177686]

BFD:BFD[9.177686] → [9.165766:165766]

B:BD[9.174206] → [4.509:629]

∅:D[12.43] → [9.174206:174402]

∅:D[4.629] → [9.174206:174402]

B:BD[9.172733] → [4.215:508]

∅:D[4.508] → [9.172819:172847]

B:BD[9.170283] → [13.115:151]

∅:D[13.151] → [9.170283:170483]

B:BD[9.172597] → [4.68:214]

∅:D[4.214] → [9.172597:172733]

B:BD[9.174402] → [12.44:80]

B:BD[12.80] → [4.630:667]

∅:D[4.667] → [9.174495:174838]

B:BD[9.167480] → [13.12:114]

∅:D[7.1535] → [14.12:389]

B:BD[9.169643] → [14.12:389]

∅:D[14.389] → [9.169733:170283]

∅:D[15.394] → [9.169733:170283]

B:BD[13.114] → [7.1051:1383]

B:BD[9.169643] → [7.1384:1535]

∅:D[13.114] → [9.167813:167814]

∅:D[15.180] → [9.167813:167814]

∅:D[7.1383] → [9.167813:167814]

B:BD[9.174838] → [3.12:230]

∅:D[3.230] → [16.24758:24806]

B:BD[9.167039] → [6.12:44]

∅:D[6.44] → [9.167080:167316]

  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()
  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
  -- 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)
    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)
function source.initialize_edit_side()
  load_from_disk(Editor_state)
  Text.redraw_all(Editor_state)
  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)
  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}
  end
  Editor_state.filename = basename(Editor_state.filename)  -- migrate settings that used full paths; we now support only relative paths within the app
  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
  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

File deletion: commands.lua, commands.lua

BFD:BFD[8.2] → [9.207726:207762]

BFD:BFD[9.207762] → [9.204370:204370]

B:BD[9.207265] → [17.410:482]

∅:D[17.482] → [18.1162:1491]

B:BD[9.207201] → [17.382:409]

∅:D[17.409] → [9.207233:207265]

B:BD[9.207117] → [17.56:85]

∅:D[5.58] → [17.85:189]

B:BD[17.85] → [17.85:189]

∅:D[5.285] → [17.189:381]

B:BD[17.189] → [17.189:381]

∅:D[17.381] → [9.207117:207173]

B:BD[17.189] → [5.59:285]

B:BD[17.85] → [5.29:58]

B:BD[19.244] → [17.29:55]

∅:D[17.55] → [19.365:378]

    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)
  local candidate = guess_source(s..'.lua')
  source.switch_to_file(candidate)
  reset_file_navigator()
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)
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)
  move_candidate_to_front(s)
      navigate_to_file(s)
    end
  })

Insertion in source_file.lua at line 218 [20.150304]

[10.499]

end
function dirname(path)
  local os_path_separator = package.config:sub(1,1)
  if os_path_separator == '/' then
    -- POSIX systems permit backslashes in filenames
    return path:match('.*/') or './'
  elseif os_path_separator == '\\' then
    return path:match('.*[/\\]') or './'
  else
    error('What OS is this? LÖVE reports that the path separator is "'..os_path_separator..'"')
  end
end
function test_dirname()
  check_eq(dirname('a/b'), 'a/', 'F - test_dirname')
  check_eq(dirname('x'), './', 'F - test_dirname/current')
end
function basename(path)
  local os_path_separator = package.config:sub(1,1)
  if os_path_separator == '/' then
    -- POSIX systems permit backslashes in filenames
    return string.gsub(path, ".*/(.*)", "%1")
  elseif os_path_separator == '\\' then
    return string.gsub(path, ".*[/\\](.*)", "%1")
  else
    error('What OS is this? LÖVE reports that the path separator is "'..os_path_separator..'"')
  end

Insertion in source_file.lua at line 248 [20.150304]

[10.503]


function empty(h)
  for _,_ in pairs(h) do
    return false
  end
  return true
end

Insertion in source.lua at line 48 [20.165829]
[2.428]
[20.166577]
```
    cursors = {},  -- filename to cursor1, screen_top1
```
Replacement in source.lua at line 75 [20.165829]
B:BD[20.167102] → [20.167102:167143]
```
  source.initialize_edit_side{'run.lua'}
```
[20.167102]
[20.167143]
```
  source.initialize_edit_side()
```

Replacement in source.lua at line 86 [20.165829]

B:BD[20.167543] → [20.167543:167706]

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)

[20.167543]

[20.167706]

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 95 [20.165829]

B:BD[20.167796] → [20.167796:167950]

  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 137 [20.165829]

B:BD[20.169706] → [20.169706:169796]

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

[20.169706]

[20.169796]

  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 160 [20.165829]
[20.170346]
[20.170346]
```
  Editor_state.filename = 'run.lua'
```

Insertion in source.lua at line 222 [20.165829]

[20.172660]

  -- 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 228 [20.165829]

B:BD[20.172796] → [20.172796:172882]

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

[20.172796]

[20.172882]

  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 274 [20.165829]

∅:D[21.4880] → [20.173971:174018]

B:BD[20.173971] → [20.173971:174018]

B:BD[20.174018] → [10.506:647]

  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 276 [20.165829]

[20.174269]

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

Replacement in source.lua at line 281 [20.165829]

B:BD[20.174465] → [20.174465:174558]

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

[20.174465]

[20.174558]

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

Insertion in source.lua at line 293 [20.165829]

[20.174901]

[22.23378]

  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 search.lua at line 24 [25.48846]

B:BD[23.758] → [24.7067:7162]

  local pos = find(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos)

Deletion in search.lua at line 31 [25.48846]
B:BD[26.211] → [24.7163:7220]
```
      pos = find(State.lines[i].data, State.search_term)
```
Deletion in search.lua at line 41 [25.48846]
B:BD[26.368] → [24.7221:7278]
```
      pos = find(State.lines[i].data, State.search_term)
```

Deletion in search.lua at line 50 [25.48846]

B:BD[23.833] → [24.7279:7351]

    pos = find(State.lines[State.cursor1.line].data, State.search_term)

Deletion in search.lua at line 70 [25.48846]

B:BD[27.800] → [24.7352:7450]

  local pos = rfind(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos-1)

Deletion in search.lua at line 77 [25.48846]
B:BD[26.1238] → [24.7451:7509]
```
      pos = rfind(State.lines[i].data, State.search_term)
```
Deletion in search.lua at line 87 [25.48846]
B:BD[26.1411] → [24.7510:7568]
```
      pos = rfind(State.lines[i].data, State.search_term)
```

Deletion in search.lua at line 96 [25.48846]

B:BD[27.910] → [24.7569:7642]

    pos = rfind(State.lines[State.cursor1.line].data, State.search_term)

Deletion in commands.lua at line 67 [20.203826]

B:BD[2.1772] → [2.1772:1805]

∅:D[2.1805] → [20.205816:205943]

B:BD[20.205816] → [20.205816:205943]

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

B:BD[2.3240] → [2.3240:3361]

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

[2.3240]

[2.3361]

      navigate_to_file(s)

Insertion in commands.lua at line 132 [20.203826]

[20.206573]

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

B:BD[20.206657] → [20.206657:206689]

B:BD[20.206689] → [2.3581:3707]

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

[20.206657]

[20.206689]

    reset_file_navigator()

Replacement in commands.lua at line 159 [20.203826]

B:BD[20.206721] → [20.206721:206884]

B:BD[20.206884] → [2.3708:3834]

    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

[20.206721]

[2.3834]

    navigate_to_file(File_navigation.candidates[File_navigation.index])