akkartik/techmeet-capture.love - Change 57OGXVHZ44WNWVKNCMPJT7SAOF4MR4GXJ4ZQKHUFAKLZBB6ERDLAC

Merge lines.love

Created by Kartik K. Agaram on September 3, 2022

57OGXVHZ44WNWVKNCMPJT7SAOF4MR4GXJ4ZQKHUFAKLZBB6ERDLAC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 29 [5.178044]

B:BD[5.178636] → [5.178636:179196]

  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)

[5.178636]

[5.179196]

  assert(#arg == 0)
  Editor_state.file_path = os.date('%Y/%m/%d/%H-%M-%S')
  Editor_state.filename = Editor_state.directory..Editor_state.file_path
  Text.redraw_all(Editor_state)
  os.execute('mkdir -p '..dirname(Editor_state.filename))
  assert(not file_exists(Editor_state.filename))

Replacement in run.lua at line 36 [5.178044]

B:BD[5.179197] → [5.179197:179276]

  if #arg > 1 then
    print('ignoring commandline args after '..arg[1])
  end

[5.179197]

[5.179276]

  love.window.setTitle('capture.love - '..Editor_state.filename)

Deletion in run.lua at line 56 [5.178044]

B:BD[5.180163] → [5.180163:180297]

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

Deletion in run.lua at line 93 [5.178044]

B:BD[5.181820] → [5.181820:182297]

function run.filedropped(file)
  -- first make sure to save edits on any existing file
  if Editor_state.next_save then
    save_to_disk(Editor_state)
  end
  -- clear the slate for the new file
  App.initialize_globals()
  Editor_state.filename = file:getFilename()
  file:open('r')
  Editor_state.lines = load_from_file(file)
  file:close()
  Text.redraw_all(Editor_state)
  edit.fixup_cursor(Editor_state)
  love.window.setTitle('lines.love - '..Editor_state.filename)
end

Deletion in run.lua at line 108 [5.178044]

B:BD[5.182570] → [5.182570:182756]

  local filename = Editor_state.filename
  if filename:sub(1,1) ~= '/' then
    filename = love.filesystem.getWorkingDirectory()..'/'..filename  -- '/' should work even on Windows
  end

Deletion in run.lua at line 112 [5.178044]

B:BD[5.182904] → [5.182904:182996]

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

Replacement in main.lua at line 34 [8.2]

B:BD[6.127] → [7.148:168]

B:BD[7.168] → [9.8:137]

∅:D[10.87] → [11.8:40]

∅:D[9.137] → [11.8:40]

B:BD[12.90] → [11.8:40]

∅:D[11.40] → [12.90:197]

B:BD[12.90] → [12.90:197]

  assert(#arg == 0)
  Editor_state.file_path = os.date('%Y/%m/%d/%H-%M-%S')
  Editor_state.filename = Editor_state.directory..Editor_state.file_path
  Text.redraw_all(Editor_state)
  os.execute('mkdir -p '..dirname(Editor_state.filename))
  assert(not file_exists(Editor_state.filename))

[6.127]

[3.9]

  if Current_app == nil then
    Current_app = 'run'
  end

Deletion in main.lua at line 38 [8.2]

B:BD[13.9] → [12.198:263]

  love.window.setTitle('capture.love - '..Editor_state.filename)

Resurrecting zombie bytes in main.lua at line 38 [8.2]

B:B[13.9] → [5.185083:186724]

BD:B[13.9] → [5.185083:186724]

B:B[13.88] → [5.186725:186729]

BD:B[13.88] → [5.186725:186729]

  if Current_app == 'run' then
    load_file_from_source_or_save_directory('file.lua')
    load_file_from_source_or_save_directory('run.lua')
      load_file_from_source_or_save_directory('edit.lua')
      load_file_from_source_or_save_directory('text.lua')
        load_file_from_source_or_save_directory('search.lua')
        load_file_from_source_or_save_directory('select.lua')
        load_file_from_source_or_save_directory('undo.lua')
      load_file_from_source_or_save_directory('icons.lua')
      load_file_from_source_or_save_directory('text_tests.lua')
    load_file_from_source_or_save_directory('run_tests.lua')
    load_file_from_source_or_save_directory('drawing.lua')
      load_file_from_source_or_save_directory('geom.lua')
      load_file_from_source_or_save_directory('help.lua')
    load_file_from_source_or_save_directory('drawing_tests.lua')
  else
    load_file_from_source_or_save_directory('source_file.lua')
    load_file_from_source_or_save_directory('source.lua')
      load_file_from_source_or_save_directory('commands.lua')
      load_file_from_source_or_save_directory('source_edit.lua')
      load_file_from_source_or_save_directory('log_browser.lua')
      load_file_from_source_or_save_directory('source_text.lua')
        load_file_from_source_or_save_directory('search.lua')
        load_file_from_source_or_save_directory('select.lua')
        load_file_from_source_or_save_directory('source_undo.lua')
        load_file_from_source_or_save_directory('colorize.lua')
      load_file_from_source_or_save_directory('source_text_tests.lua')
    load_file_from_source_or_save_directory('source_tests.lua')
end

Insertion in main.lua at line 66 [8.2]
[5.186724]
[5.186725]
```
  end
```

Deletion in main.lua at line 78 [8.2]

B:BD[14.517] → [15.4934:5089]

BD:BD[14.517] → [15.4934:5089]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, settings.font_height, math.floor(settings.font_height*1.3))

Replacement in main.lua at line 91 [8.2]

B:BD[5.187329] → [5.187329:187381]

  love.window.setTitle('text.love - '..Current_app)

[5.187329]

[16.1139]

  love.window.setTitle('capture.love - '..Current_app)

Replacement in main.lua at line 113 [8.2]

B:BD[5.187950] → [5.187950:188002]

  love.window.setTitle('text.love - '..Current_app)

[5.187950]

[17.440]

  love.window.setTitle('capture.love - '..Current_app)

Insertion in main.lua at line 116 [8.2]

[18.7]

[19.1353]

function App.focus(in_focus)
  if in_focus then
    Last_focus_time = App.getTime()
  end
  if Current_app == 'run' then
    if run.focus then run.focus(in_focus) end
  elseif Current_app == 'source' then
    if source.focus then source.focus(in_focus) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end

Deletion in main.lua at line 154 [8.2]
B:BD[20.86976] → [12.264:268]
BD:BD[20.86976] → [12.264:268]
```
  }
```

Resurrecting zombie bytes in main.lua at line 154 [8.2]

B:B[21.8] → [5.188673:189596]

BD:B[21.8] → [5.188673:189596]

B:B[22.181] → [5.189597:189872]

BD:B[22.181] → [5.189597:189872]

function App.keychord_pressed(chord, key)
  -- ignore events for some time after window in focus (mostly alt-tab)
  if App.getTime() < Last_focus_time + 0.01 then
    return
  end
  --
  if chord == 'C-e' then
    -- carefully save settings
    if Current_app == 'run' then
      local source_settings = Settings.source
      Settings = run.settings()
      Settings.source = source_settings
      if run.quit then run.quit() end
      Current_app = 'source'
    elseif Current_app == 'source' then
      Settings.source = source.settings()
      if source.quit then source.quit() end
      Current_app = 'run'
    else
      assert(false, 'unknown app "'..Current_app..'"')
    end
    Settings.current_app = Current_app
    love.filesystem.write('config', json.encode(Settings))
    -- reboot
    load_file_from_source_or_save_directory('main.lua')
    App.undo_initialize()
    App.run_tests_and_initialize()
    return
  if Current_app == 'run' then
    if run.keychord_pressed then run.keychord_pressed(chord, key) end
  elseif Current_app == 'source' then
    if source.keychord_pressed then source.keychord_pressed(chord, key) end
  else
    assert(false, 'unknown app "'..Current_app..'"')

Insertion in main.lua at line 182 [8.2]
[5.189596]
[5.189597]
```
  end
```

Deletion in main.lua at line 261 [8.2]

B:BD[18.7] → [5.188003:188087]

BD:BD[18.7] → [5.188003:188087]

B:BD[23.1119] → [5.188088:188321]

BD:BD[23.1119] → [5.188088:188321]

B:BD[6.127] → [5.185029:185082]

BD:BD[6.127] → [5.185029:185082]

function App.focus(in_focus)
  if in_focus then
    Last_focus_time = App.getTime()
  if Current_app == 'run' then
    if run.focus then run.focus(in_focus) end
  elseif Current_app == 'source' then
    if source.focus then source.focus(in_focus) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
  if Current_app == nil then
    Current_app = 'run'

Solving an order conflict in main.lua at line 261 [8.2]
[24.268]
Deletion in Manual_tests.md at line 25 [26.1]
∅:D[4.85] → [25.338:385]
B:BD[27.1687] → [25.338:385]
```
* Logging files created in the 'recent' file.
```
Insertion in Manual_tests.md at line 27 [26.1]
[5.211526]
[5.211526]
```
* Logging files created in the 'recent' file.
```