akkartik/pong.love - Change GG2553RBUKMCWIAD3EWJV7C2QH2BIS5V2E3BDTFSTYRHAPXGBF7QC

Merge text.love

Created by Kartik K. Agaram on December 23, 2022

GG2553RBUKMCWIAD3EWJV7C2QH2BIS5V2E3BDTFSTYRHAPXGBF7QC

Dependencies

In channels

main

Change contents

File deletion: text.lua, source_text.lua, text.lua
BFD:BFD[8.2] → [9.1451:1483]
BFD:BFD[8.2] → [11.90:129]
BFD:BFD[11.129] → [9.1:1]
BFD:BFD[8.2] → [9.1451:1483]
BFD:BFD[9.1483] → [9.1:1]
B:BD[12.518] → [13.1070:1180]
∅:D[13.1180] → [14.48:121]
B:BD[15.1568] → [13.1034:1069]
∅:D[13.1069] → [16.1143:1182]
```
-- Don't handle any keys here that would trigger text_input above.
function Text.keychord_press(State, chord)
--?   print('chord', chord, State.selection1.line, State.selection1.pos)
function Text.text_input(State, t)
  if App.mouse_down(1) then return end
```

File deletion: edit.lua, source_edit.lua, edit.lua

BFD:BFD[8.2] → [17.16048:16080]

BFD:BFD[8.2] → [11.173:212]

BFD:BFD[11.212] → [17.413:413]

BFD:BFD[8.2] → [17.16048:16080]

BFD:BFD[17.16080] → [17.413:413]

B:BD[18.22362] → [6.26:86]

B:BD[19.519] → [13.6139:6186]

∅:D[13.6186] → [20.7237:7264]

B:BD[19.210] → [13.6091:6138]

B:BD[19.363] → [21.835:880]

∅:D[21.880] → [20.7048:7075]

∅:D[13.6138] → [20.6864:6891]

B:BD[20.6528] → [13.6021:6090]

B:BD[19.119] → [21.789:834]

∅:D[21.834] → [19.166:210]

∅:D[13.6090] → [20.6600:6627]

B:BD[20.6451] → [13.5989:6020]

∅:D[13.6020] → [20.6481:6528]

B:BD[20.6268] → [13.5854:5988]

∅:D[13.5988] → [20.6403:6430]

B:BD[20.6184] → [13.5808:5853]

∅:D[13.5853] → [20.6228:6268]

B:BD[17.16001] → [13.5759:5807]

∅:D[13.5807] → [20.6141:6146]

B:BD[22.1400] → [13.5720:5758]

∅:D[13.5758] → [17.15990:16001]

B:BD[17.10343] → [13.5627:5675]

∅:D[13.5675] → [23.6800:6831]

B:BD[17.9696] → [13.5558:5593]

∅:D[13.5593] → [23.6394:6495]

B:BD[17.8364] → [13.5450:5504]

∅:D[13.5504] → [23.5299:5338]

B:BD[17.6757] → [21.669:721]

∅:D[21.721] → [23.4542:4581]

∅:D[6.86] → [18.22398:22422]

    left = math.floor(left),
    right = math.floor(right),
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.mouse_release(State, x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.screen.contents = {}
  App.screen.contents = {}
  edit.keychord_press(State, chord)
  edit.key_release(State, chord)
  edit.mouse_press(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  App.screen.contents = {}
-- not all keys are text_input
function edit.run_after_keychord(State, chord)
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
  App.screen.contents = {}
-- all text_input events are also keypresses
-- TODO: handle chords of multiple keys
function edit.key_release(State, key, scancode)
end
    Text.keychord_press(State, chord)
  end
end
function edit.keychord_press(State, chord, key)
  if State.selection1.line and
function edit.text_input(State, t)
  if State.search_term then
    State.search_term = State.search_term..t
    State.search_text = nil
function edit.mouse_release(State, x,y, mouse_button)
  if State.search_term then return end
function edit.mouse_press(State, x,y, mouse_button)
  if State.search_term then return end
    width = right-left,

File deletion: text_tests.lua, source_text_tests.lua, text_tests.lua

BFD:BFD[8.2] → [24.43801:43839]

BFD:BFD[8.2] → [11.43:88]

BFD:BFD[11.88] → [24.2:2]

BFD:BFD[8.2] → [24.43801:43839]

BFD:BFD[24.43839] → [24.2:2]

B:BD[25.7400] → [26.140:354]

∅:D[5.244] → [26.435:492]

B:BD[26.435] → [26.435:492]

B:BD[26.492] → [5.245:419]

B:BD[27.2915] → [5.1926:2310]

B:BD[25.31411] → [28.1501:1609]

B:BD[29.470] → [13.985:1032]

∅:D[13.1032] → [29.516:756]

B:BD[30.442] → [13.937:984]

∅:D[13.984] → [30.488:716]

B:BD[31.451] → [13.889:936]

∅:D[13.936] → [31.497:746]

B:BD[32.1132] → [13.840:888]

∅:D[13.888] → [32.1179:1427]

B:BD[32.750] → [13.792:839]

∅:D[13.839] → [32.796:1051]

B:BD[23.2291] → [13.696:743]

∅:D[7.49] → [33.1650:1741]

B:BD[20.6032] → [33.1650:1741]

B:BD[33.1741] → [7.51:51]

∅:D[7.51] → [25.53832:53929]

B:BD[34.381] → [7.2:49]

∅:D[13.743] → [25.51178:51358]

B:BD[24.32347] → [13.554:695]

∅:D[13.695] → [35.950:1063]

B:BD[36.813] → [13.412:553]

∅:D[13.553] → [25.40513:40814]

B:BD[37.603] → [13.364:411]

∅:D[13.411] → [25.39627:40033]

∅:D[28.1609] → [24.18213:18405]

B:BD[25.31375] → [28.1393:1500]

∅:D[28.1500] → [25.31376:31411]

B:BD[18.9105] → [28.1283:1392]

∅:D[28.1392] → [25.31340:31375]

B:BD[20.4215] → [28.912:1282]

∅:D[28.1282] → [18.9082:9105]

B:BD[20.4166] → [28.511:911]

∅:D[28.911] → [24.17356:17458]

B:BD[25.30531] → [28.392:510]

∅:D[28.510] → [24.16879:16955]

B:BD[23.1095] → [13.316:363]

∅:D[13.363] → [18.4910:4939]

B:BD[25.30495] → [28.274:391]

∅:D[28.391] → [25.30496:30531]

B:BD[38.465] → [13.194:315]

∅:D[13.315] → [38.531:620]

B:BD[18.9081] → [28.156:273]

∅:D[28.273] → [25.30460:30495]

B:BD[39.365] → [13.146:193]

∅:D[13.193] → [39.396:452]

B:BD[40.401] → [13.50:145]

∅:D[13.145] → [25.13019:13335]

B:BD[24.16080] → [28.2:155]

∅:D[28.155] → [18.8890:8947]

∅:D[5.2310] → [27.3332:3337]

B:BD[24.1764] → [5.1788:1925]

∅:D[5.1925] → [27.2339:2915]

B:BD[27.1843] → [5.1484:1787]

∅:D[5.1787] → [24.1759:1764]

B:BD[27.1225] → [5.1400:1483]

∅:D[5.1483] → [27.1330:1843]

B:BD[41.473] → [5.1319:1399]

∅:D[5.1399] → [42.524:529]

B:BD[27.1219] → [5.1241:1318]

∅:D[5.1318] → [41.106:193]

B:BD[27.848] → [5.907:1240]

∅:D[5.1240] → [27.1214:1219]

B:BD[43.954] → [5.803:906]

∅:D[5.906] → [27.290:848]

B:BD[43.616] → [5.502:802]

∅:D[5.802] → [43.949:954]

B:BD[41.7] → [5.420:501]

∅:D[5.501] → [43.105:616]

∅:D[5.419] → [41.2:7]

∅:D[26.662] → [41.2:7]

B:BD[26.354] → [5.78:244]

B:BD[44.1007] → [26.98:139]

∅:D[26.139] → [25.7320:7400]

B:BD[45.988] → [26.42:97]

∅:D[26.97] → [44.975:1007]

B:BD[23.82] → [13.2:49]

∅:D[13.49] → [18.491:520]

B:BD[46.4280] → [5.2:77]

∅:D[5.77] → [26.2:41]

B:BD[47.40] → [26.2:41]

∅:D[26.41] → [45.942:988]

  Editor_state.selection1 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- selection is empty to avoid perturbing future edits
  check_nil(Editor_state.selection1.line, 'F - test_click_moves_cursor/selection:line')
  check_nil(Editor_state.selection1.pos, 'F - test_click_moves_cursor/selection:pos')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line_takes_margins_into_account/selection is empty to avoid perturbing future edits')
  App.screen.check(y, 'mno', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:3')
  edit.run_after_text_input(Editor_state, 'a')
  edit.run_after_keychord(Editor_state, 'up')
  -- cursor wraps
  check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap_upwards/1/cursor:line')
  check_eq(Editor_state.cursor1.pos, 5, 'F - test_search_wrap_upwards/1/cursor:pos')
end
  edit.run_after_text_input(Editor_state, 'a')
  edit.run_after_keychord(Editor_state, 'return')
  -- cursor wraps
  check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap/1/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_wrap/1/cursor:pos')
end
  edit.run_after_text_input(Editor_state, 'a')
  -- search for previous occurrence
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_search_upwards/2/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_upwards/2/cursor:pos')
end
  edit.run_after_text_input(Editor_state, 'de')
  edit.run_after_keychord(Editor_state, 'down')
  edit.run_after_keychord(Editor_state, 'return')
  check_eq(Editor_state.cursor1.line, 4, 'F - test_search/2/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/2/cursor:pos')
end
  edit.run_after_text_input(Editor_state, 'd')
  edit.run_after_keychord(Editor_state, 'return')
  check_eq(Editor_state.cursor1.line, 2, 'F - test_search/1/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/1/cursor:pos')
  -- reset cursor
  Editor_state.cursor1 = {line=1, pos=1}
  edit.run_after_text_input(Editor_state, 'g')
  check_eq(Editor_state.lines[1].data, 'xbc', 'F - test_undo_restores_selection/baseline')
  check_nil(Editor_state.selection1.line, 'F - test_undo_restores_selection/baseline:selection')
  edit.run_after_text_input(Editor_state, 'x')
  check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_insert_text/baseline/cursor:line')
  check_eq(Editor_state.cursor1.pos, 5, 'F - test_undo_insert_text/baseline/cursor:pos')
  edit.run_after_text_input(Editor_state, 's')
  edit.run_after_text_input(Editor_state, 't')
  edit.run_after_text_input(Editor_state, 'u')
  check_eq(Editor_state.cursor1.pos, 28, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')
  edit.run_after_text_input(Editor_state, 'j')
  edit.run_after_text_input(Editor_state, 'k')
  edit.run_after_text_input(Editor_state, 'l')
  check_eq(Editor_state.screen_top1.line, 2, 'F - test_typing_on_bottom_line_scrolls_down/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_typing_on_bottom_line_scrolls_down/cursor:line')
  check_eq(Editor_state.cursor1.pos, 7, 'F - test_typing_on_bottom_line_scrolls_down/cursor:pos')
  edit.run_after_text_input(Editor_state, 'a')
  check_eq(Editor_state.screen_top1.line, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen_top')
  check_eq(Editor_state.cursor1.line, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:pos')
end
function test_up_arrow_moves_cursor()
  io.write('\ntest_up_arrow_moves_cursor')
  -- display the first 3 lines with the cursor on the bottom line
  App.screen.init{width=120, height=60}
  App.screen.check(y, 'kl', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')
  y = y + Editor_state.line_height
  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')
  y = y + Editor_state.line_height
  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line')
  check_eq(Editor_state.cursor1.pos, 5, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')
  y = Editor_state.top
  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos')
  -- after hitting down arrow the screen doesn't scroll down further, and certainly doesn't scroll up
  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')
  -- after hitting pagedown the screen scrolls down to start of a long line
  edit.run_after_text_input(Editor_state, 'g')
  local y = Editor_state.top
  App.screen.check(y, 'def', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2')
  y = y + Editor_state.line_height
  edit.keychord_press(Editor_state, 'd', 'd')
  edit.text_input(Editor_state, 'D')
  edit.key_release(Editor_state, 'd')
  App.fake_key_release('lshift')
  -- selected text is deleted and replaced with the key
  App.screen.check(y, 'abc', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1')
  y = y + Editor_state.line_height
  edit.run_after_text_input(Editor_state, 'x')
  -- selected text is deleted and replaced with the key
  edit.key_release(Editor_state, 'lshift')
  -- selection persists even after shift is release
  check_eq(Editor_state.selection1.line, 1, 'F - test_select_text/selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text/selection:pos')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_select_text/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text/cursor:pos')
function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up()
  io.write('\ntest_pagedown_followed_by_down_arrow_does_not_scroll_screen_up')
  App.screen.init{width=Editor_state.left+30, height=60}
end
function test_click_on_wrapping_line_takes_margins_into_account()
  io.write('\ntest_click_on_wrapping_line_takes_margins_into_account')
  -- display two lines with cursor on one of them
  App.screen.init{width=100, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.left = 50  -- occupy only right side of screen
  Editor_state.lines = load_array{'abc def ghi jkl mno pqr stu'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=20}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  -- click on the other line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- cursor moves
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line/selection is empty to avoid perturbing future edits')
end
function test_click_on_wrapping_line()
  io.write('\ntest_click_on_wrapping_line')
  -- display two lines with cursor on one of them
  App.screen.init{width=50, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc def ghi jkl mno pqr stu'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=20}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  -- click on the other line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- cursor moves
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_empty_line/cursor')
end
function test_click_on_empty_line()
  io.write('\ntest_click_on_empty_line')
  -- display two lines with the first one empty
  App.screen.init{width=50, height=80}
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_takes_margins_into_account/selection is empty to avoid perturbing future edits')
end
function test_click_takes_margins_into_account()
  io.write('\ntest_click_takes_margins_into_account')
  -- display two lines with cursor on one of them
  App.screen.init{width=100, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.left = 50  -- occupy only right side of screen
  Editor_state.lines = load_array{'abc', 'def'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=2, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  -- click on the other line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- cursor moves
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_to_left_of_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_to_left_of_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_to_left_of_line/selection is empty to avoid perturbing future edits')
end
function test_click_to_left_of_line()
  io.write('\ntest_click_to_left_of_line')
  -- display a line with the cursor in the middle
  App.screen.init{width=50, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=3}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  -- click to the left of the line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left-4,Editor_state.top+5, 1)
  -- cursor moves to start of line
end
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_moves_cursor/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_moves_cursor/cursor:pos')
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
  Text.redraw_all(Editor_state)
  edit.run_after_text_input(Editor_state, 'a')
  local y = Editor_state.top
function test_click_moves_cursor()
  io.write('\ntest_click_moves_cursor')
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()

File deletion: source.lua, source.lua

BFD:BFD[8.2] → [48.177715:177749]

BFD:BFD[48.177749] → [48.165829:165829]

B:BD[48.177458] → [7.7575:7652]

∅:D[7.7652] → [48.177537:177714]

B:BD[48.177393] → [7.7517:7574]

∅:D[7.7574] → [48.177451:177458]

B:BD[48.177249] → [7.7473:7516]

∅:D[7.7516] → [48.177293:177393]

B:BD[48.177167] → [7.7403:7472]

∅:D[7.7472] → [48.177238:177249]

B:BD[48.177101] → [7.7345:7402]

∅:D[7.7402] → [48.177160:177167]

B:BD[48.176250] → [7.7295:7344]

∅:D[7.7344] → [48.176301:176452]

B:BD[48.176070] → [7.7251:7294]

∅:D[7.7294] → [48.176115:176250]

B:BD[48.176004] → [7.7194:7250]

∅:D[7.7250] → [48.176059:176070]

B:BD[48.175954] → [7.7149:7193]

∅:D[7.7193] → [48.175997:176004]

B:BD[49.661] → [7.7112:7148]

∅:D[7.7148] → [49.696:713]

B:BD[48.175825] → [7.7081:7111]

∅:D[7.7111] → [48.175854:175928]

B:BD[48.175738] → [7.7005:7080]

∅:D[7.7080] → [48.175814:175825]

B:BD[48.175667] → [7.6941:7004]

∅:D[7.7004] → [48.175731:175738]

B:BD[48.175517] → [7.6891:6940]

∅:D[7.6940] → [48.175567:175667]

B:BD[48.175324] → [7.6824:6890]

∅:D[7.6890] → [48.175392:175517]

B:BD[48.175054] → [7.6769:6823]

∅:D[7.6823] → [48.175110:175316]

B:BD[50.2826] → [7.6714:6768]

∅:D[7.6768] → [50.2882:2899]

B:BD[48.174633] → [7.6666:6713]

∅:D[7.6713] → [48.174682:174901]

B:BD[48.172439] → [7.6613:6665]

∅:D[7.6665] → [48.172493:172660]

B:BD[48.171997] → [7.6580:6612]

∅:D[7.6612] → [48.172031:172434]

    return log_browser.keychord_press(Log_browser_state, chordkey, scancode)
  end
end
-- use this sparingly
function to_text(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  return Text_cache[s]
end
    return edit.key_release(Editor_state, key, scancode)
  else
function source.key_release(key, scancode)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
    return log_browser.keychord_press(Log_browser_state, chord, key)
  end
end
    return edit.keychord_press(Editor_state, chord, key)
  else
    keychord_press_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
function source.keychord_press(chord, key)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print('source keychord')
  if Show_file_navigator then
    return log_browser.text_input(Log_browser_state, t)
  end
end
    return edit.text_input(Editor_state, t)
  else
    text_input_on_file_navigator(t)
    return
  end
function source.text_input(t)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button)
  end
end
    return edit.mouse_release(Editor_state, x,y, mouse_button)
  else
function source.mouse_release(x,y, mouse_button)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
    log_browser.mouse_press(Log_browser_state, x,y, mouse_button)
    for _,line_cache in ipairs(Editor_state.line_cache) do line_cache.starty = nil end  -- just in case we scroll
  end
end
    edit.mouse_press(Editor_state, x,y, mouse_button)
  elseif Show_log_browser_side and Log_browser_state.left <= x and x < Log_browser_state.right then
--?     print('click on log_browser side')
    if Focus ~= 'log_browser' then
      Focus = 'log_browser'
    edit.mouse_press(Editor_state, x,y, mouse_button)
    return
  end
function source.mouse_press(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)
-- a copy of source.file_drop when given a filename
function source.switch_to_file(filename)
  -- first make sure to save edits on any existing file
  if Editor_state.next_save then
    save_to_disk(Editor_state)
  end
function source.file_drop(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
  Editor_state.filename = file:getFilename()
  file:open('r')
  Editor_state.lines = load_from_file(file)
  file:close()
  Text.redraw_all(Editor_state)
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.cursor1 = {line=1, pos=1}

File deletion: run.lua, run.lua

BFD:BFD[8.2] → [48.183867:183898]

BFD:BFD[48.183898] → [48.178107:178107]

B:BD[48.183639] → [7.8005:8060]

∅:D[7.8060] → [48.183695:183866]

B:BD[48.183524] → [7.7964:8004]

∅:D[7.8004] → [48.183565:183639]

B:BD[48.183462] → [7.7908:7963]

∅:D[7.7963] → [48.183519:183524]

B:BD[48.183346] → [7.7867:7907]

∅:D[7.7907] → [48.183388:183462]

B:BD[48.183300] → [7.7824:7866]

∅:D[7.7866] → [48.183341:183346]

B:BD[48.183200] → [7.7796:7823]

∅:D[7.7823] → [48.183226:183300]

B:BD[48.183133] → [7.7734:7795]

∅:D[7.7795] → [48.183195:183200]

B:BD[48.183012] → [7.7687:7733]

∅:D[7.7733] → [48.183059:183133]

B:BD[48.181676] → [7.7657:7686]

∅:D[7.7686] → [48.181707:182338]

  return edit.key_release(Editor_state, key, scancode)
end
-- use this sparingly
function to_text(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  return Text_cache[s]
end
function run.key_release(key, scancode)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  return edit.keychord_press(Editor_state, chord, key)
end
function run.keychord_press(chord, key)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  return edit.text_input(Editor_state, t)
end
function run.text_input(t)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  return edit.mouse_release(Editor_state, x,y, mouse_button)
end
function run.mouse_release(x,y, mouse_button)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
function run.file_drop(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)
  love.window.setTitle('text.love - '..Editor_state.filename)
end
function run.draw()
  edit.draw(Editor_state)
end
function run.update(dt)
  Cursor_time = Cursor_time + dt
  edit.update(Editor_state, dt)
end
function run.quit()
  edit.quit(Editor_state)
end
function run.settings()

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[8.2] → [48.202684:202723]

BFD:BFD[48.202723] → [48.191243:191243]

B:BD[48.202624] → [7.8696:8751]

∅:D[7.8751] → [48.202679:202683]

B:BD[48.200938] → [7.8640:8695]

∅:D[7.8695] → [48.200995:202624]

B:BD[48.200892] → [7.8597:8639]

∅:D[7.8639] → [48.200933:200938]

B:BD[48.200825] → [7.8535:8596]

∅:D[7.8596] → [48.200887:200892]

B:BD[48.198624] → [7.8475:8534]

∅:D[7.8534] → [48.198685:200825]

function log_browser.key_release(State, key, scancode)
end
function log_browser.keychord_press(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.text_input(State, t)
end
function log_browser.mouse_release(State, x,y, mouse_button)
end
function log_browser.mouse_press(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

File deletion: commands.lua, commands.lua

BFD:BFD[8.2] → [48.207182:207218]

BFD:BFD[48.207218] → [48.203826:203826]

B:BD[49.7743] → [7.42257:42298]

∅:D[7.42298] → [49.7783:7906]

B:BD[50.3524] → [7.42202:42256]

∅:D[7.42256] → [49.3441:3580]

function text_input_on_file_navigator(t)
  File_navigation.filter = File_navigation.filter..t
  File_navigation.candidates = source.file_navigator_candidates()
end
function keychord_press_on_file_navigator(chord, key)
  log(2, 'file navigator: '..chord)
  log(2, {name='file_navigator_state', files=File_navigation.candidates, index=File_navigation.index})

Replacement in source_text_tests.lua at line 68 [48.3561]
B:BD[10.5128] → [10.5128:5174]
```
  edit.run_after_textinput(Editor_state, 'a')
```
[10.5128]
[10.5174]
```
  edit.run_after_text_input(Editor_state, 'a')
```

Deletion in source_text_tests.lua at line 146 [48.3561]

B:BD[10.8058] → [53.4:4]

B:BD[48.5299] → [7.56:103]

BD:BD[48.5299] → [7.56:103]

B:BD[48.13302] → [7.104:218]

BD:BD[48.13302] → [7.104:218]

B:BD[48.13508] → [7.219:274]

BD:BD[48.13508] → [7.219:274]

B:BD[48.13588] → [7.275:316]

BD:BD[48.13588] → [7.275:316]

B:BD[48.13709] → [7.317:928]

BD:BD[48.13709] → [7.317:928]

B:BD[48.13955] → [7.929:1010]

BD:BD[48.13955] → [7.929:1010]

B:BD[48.14569] → [7.1011:1311]

BD:BD[48.14569] → [7.1011:1311]

B:BD[48.14768] → [7.1312:1415]

BD:BD[48.14768] → [7.1312:1415]

B:BD[48.15451] → [7.1416:1749]

BD:BD[48.15451] → [7.1416:1749]

B:BD[48.15672] → [7.1750:1827]

BD:BD[48.15672] → [7.1750:1827]

B:BD[48.16261] → [7.1828:1908]

BD:BD[48.16261] → [7.1828:1908]

B:BD[48.18457] → [7.1909:1992]

BD:BD[48.18457] → [7.1909:1992]

B:BD[48.19075] → [7.1993:2296]

BD:BD[48.19075] → [7.1993:2296]

B:BD[48.19276] → [7.2297:2434]

BD:BD[48.19276] → [7.2297:2434]

B:BD[48.20011] → [7.2435:2819]

BD:BD[48.20011] → [7.2435:2819]

B:BD[54.1269] → [7.2820:2915]

BD:BD[54.1269] → [7.2820:2915]

B:BD[54.3062] → [7.2916:2963]

BD:BD[54.3062] → [7.2916:2963]

B:BD[54.3846] → [7.2964:3085]

BD:BD[54.3846] → [7.2964:3085]

  edit.run_after_text_input(Editor_state, 'a')
function test_click_moves_cursor()
  io.write('\ntest_click_moves_cursor')
  App.screen.init{width=50, height=60}
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.selection1 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_moves_cursor/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_moves_cursor/cursor:pos')
  -- selection is empty to avoid perturbing future edits
  check_nil(Editor_state.selection1.line, 'F - test_click_moves_cursor/selection:line')
  check_nil(Editor_state.selection1.pos, 'F - test_click_moves_cursor/selection:pos')
function test_click_to_left_of_line()
  io.write('\ntest_click_to_left_of_line')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_to_left_of_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_to_left_of_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_to_left_of_line/selection is empty to avoid perturbing future edits')
function test_click_takes_margins_into_account()
  io.write('\ntest_click_takes_margins_into_account')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_takes_margins_into_account/selection is empty to avoid perturbing future edits')
function test_click_on_empty_line()
  io.write('\ntest_click_on_empty_line')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_empty_line/cursor')
function test_click_on_wrapping_line()
  io.write('\ntest_click_on_wrapping_line')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line/selection is empty to avoid perturbing future edits')
function test_click_on_wrapping_line_takes_margins_into_account()
  io.write('\ntest_click_on_wrapping_line_takes_margins_into_account')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line_takes_margins_into_account/selection is empty to avoid perturbing future edits')
  edit.key_release(Editor_state, 'lshift')
  -- selection persists even after shift is release
  edit.run_after_text_input(Editor_state, 'x')
  edit.keychord_press(Editor_state, 'd', 'd')
  edit.text_input(Editor_state, 'D')
  edit.key_release(Editor_state, 'd')

Solving an order conflict in source_text_tests.lua at line 146 [48.3561]
[10.8058]
[54.5700]
Deletion in source_text_tests.lua at line 148 [48.3561]
B:BD[48.28312] → [7.3086:3133]
BD:BD[48.28312] → [7.3086:3133]
```
  edit.run_after_text_input(Editor_state, 'g')
```

Replacement in source_text_tests.lua at line 270 [48.3561]

B:BD[10.13127] → [10.13127:13287]

function test_click_with_mouse()
  io.write('\ntest_click_with_mouse')
  -- display two lines with cursor on one of them
  App.screen.init{width=50, height=80}

[10.13127]

[10.13287]

function test_click_moves_cursor()
  io.write('\ntest_click_moves_cursor')
  App.screen.init{width=50, height=60}

Replacement in source_text_tests.lua at line 274 [48.3561]
B:BD[10.13333] → [10.13333:13381]
```
  Editor_state.lines = load_array{'abc', 'def'}
```
[10.13333]
[10.13381]
```
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
```
Replacement in source_text_tests.lua at line 276 [48.3561]
B:BD[10.13413] → [10.13413:13454]
```
  Editor_state.cursor1 = {line=2, pos=1}
```
[10.13413]
[10.13454]
```
  Editor_state.cursor1 = {line=1, pos=1}
```

Replacement in source_text_tests.lua at line 279 [48.3561]

B:BD[10.13534] → [10.13534:13775]

B:BD[10.13775] → [53.5:128]

  -- click on the other line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- cursor moves
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse/cursor:line')
  check_nil(Editor_state.selection1.line, 'F - test_click_with_mouse/selection is empty to avoid perturbing future edits')

[10.13534]

[10.13775]

  Editor_state.selection1 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_moves_cursor/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_moves_cursor/cursor:pos')
  -- selection is empty to avoid perturbing future edits
  check_nil(Editor_state.selection1.line, 'F - test_click_moves_cursor/selection:line')
  check_nil(Editor_state.selection1.pos, 'F - test_click_moves_cursor/selection:pos')

Replacement in source_text_tests.lua at line 289 [48.3561]

B:BD[10.13780] → [10.13780:13883]

function test_click_with_mouse_to_left_of_line()
  io.write('\ntest_click_with_mouse_to_left_of_line')

[10.13780]

[10.13883]

function test_click_to_left_of_line()
  io.write('\ntest_click_to_left_of_line')

Replacement in source_text_tests.lua at line 303 [48.3561]

B:BD[10.14394] → [10.14394:14588]

B:BD[10.14588] → [53.129:268]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_to_left_of_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_with_mouse_to_left_of_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_with_mouse_to_left_of_line/selection is empty to avoid perturbing future edits')

[10.14394]

[10.14588]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_to_left_of_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_to_left_of_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_to_left_of_line/selection is empty to avoid perturbing future edits')

Replacement in source_text_tests.lua at line 308 [48.3561]

B:BD[10.14593] → [10.14593:14718]

function test_click_with_mouse_takes_margins_into_account()
  io.write('\ntest_click_with_mouse_takes_margins_into_account')

[10.14593]

[10.14718]

function test_click_takes_margins_into_account()
  io.write('\ntest_click_takes_margins_into_account')

Replacement in source_text_tests.lua at line 323 [48.3561]

B:BD[10.15276] → [10.15276:15492]

B:BD[10.15492] → [53.269:419]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_with_mouse_takes_margins_into_account/selection is empty to avoid perturbing future edits')

[10.15276]

[10.15492]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_takes_margins_into_account/selection is empty to avoid perturbing future edits')

Replacement in source_text_tests.lua at line 328 [48.3561]

B:BD[10.15497] → [10.15497:15596]

function test_click_with_mouse_on_empty_line()
  io.write('\ntest_click_with_mouse_on_empty_line')

[10.15497]

[10.15596]

function test_click_on_empty_line()
  io.write('\ntest_click_on_empty_line')

Replacement in source_text_tests.lua at line 342 [48.3561]

B:BD[10.16086] → [10.16086:16177]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_on_empty_line/cursor')

[10.16086]

[10.16177]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_empty_line/cursor')

Replacement in source_text_tests.lua at line 399 [48.3561]

B:BD[10.18282] → [10.18282:18387]

function test_click_with_mouse_on_wrapping_line()
  io.write('\ntest_click_with_mouse_on_wrapping_line')

[10.18282]

[10.18387]

function test_click_on_wrapping_line()
  io.write('\ntest_click_on_wrapping_line')

Replacement in source_text_tests.lua at line 413 [48.3561]

B:BD[10.18900] → [10.18900:19096]

B:BD[10.19096] → [53.420:560]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_on_wrapping_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_on_wrapping_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_with_mouse_on_wrapping_line/selection is empty to avoid perturbing future edits')

[10.18900]

[10.19096]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line/selection is empty to avoid perturbing future edits')

Replacement in source_text_tests.lua at line 418 [48.3561]

B:BD[10.19101] → [10.19101:19260]

function test_click_with_mouse_on_wrapping_line_takes_margins_into_account()
  io.write('\ntest_click_with_mouse_on_wrapping_line_takes_margins_into_account')

[10.19101]

[10.19260]

function test_click_on_wrapping_line_takes_margins_into_account()
  io.write('\ntest_click_on_wrapping_line_takes_margins_into_account')

Replacement in source_text_tests.lua at line 433 [48.3561]

B:BD[10.19836] → [10.19836:20086]

B:BD[10.20086] → [53.561:728]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/selection is empty to avoid perturbing future edits')

[10.19836]

[10.20086]

  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line_takes_margins_into_account/selection is empty to avoid perturbing future edits')

Replacement in source_text_tests.lua at line 609 [48.3561]

B:BD[53.1268] → [53.1268:1365]

  edit.key_released(Editor_state, 'lshift')
  -- selection persists even after shift is released

[53.1268]

[53.1365]

  edit.key_release(Editor_state, 'lshift')
  -- selection persists even after shift is release

Replacement in source_text_tests.lua at line 649 [48.3561]
B:BD[53.3065] → [53.3065:3111]
```
  edit.run_after_textinput(Editor_state, 'x')
```
[53.3065]
[53.3111]
```
  edit.run_after_text_input(Editor_state, 'x')
```

Replacement in source_text_tests.lua at line 668 [48.3561]

B:BD[53.3849] → [53.3849:3972]

  edit.keychord_pressed(Editor_state, 'd', 'd')
  edit.textinput(Editor_state, 'D')
  edit.key_released(Editor_state, 'd')

[53.3849]

[53.3972]

  edit.keychord_press(Editor_state, 'd', 'd')
  edit.text_input(Editor_state, 'D')
  edit.key_release(Editor_state, 'd')

Replacement in source_text_tests.lua at line 772 [48.3561]
B:BD[10.28137] → [10.28137:28183]
```
  edit.run_after_textinput(Editor_state, 'g')
```
[10.28137]
[10.28183]
```
  edit.run_after_text_input(Editor_state, 'g')
```

Deletion in source_text_tests.lua at line 860 [48.3561]

B:BD[10.32286] → [10.32286:32664]

B:BD[10.32664] → [53.7715:7746]

∅:D[53.7746] → [10.32664:32759]

B:BD[10.32664] → [10.32664:32759]

B:BD[10.32759] → [53.7747:7835]

∅:D[53.7835] → [10.32845:33021]

B:BD[10.32845] → [10.32845:33021]

B:BD[10.33021] → [53.7836:8025]

function test_move_cursor_using_mouse()
  io.write('\ntest_move_cursor_using_mouse')
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.selection1 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  check_eq(Editor_state.cursor1.line, 1, 'F - test_move_cursor_using_mouse/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_cursor_using_mouse/cursor:pos')
  check_nil(Editor_state.selection1.line, 'F - test_move_cursor_using_mouse/selection:line')
  check_nil(Editor_state.selection1.pos, 'F - test_move_cursor_using_mouse/selection:pos')
end

Replacement in source_text_tests.lua at line 1175 [48.3561]

B:BD[10.43529] → [10.43529:43684]

function test_page_down_followed_by_down_arrow_does_not_scroll_screen_up()
  io.write('\ntest_page_down_followed_by_down_arrow_does_not_scroll_screen_up')

[10.43529]

[10.43684]

function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up()
  io.write('\ntest_pagedown_followed_by_down_arrow_does_not_scroll_screen_up')

Replacement in source_text_tests.lua at line 1186 [48.3561]

B:BD[10.44060] → [10.44060:44178]

  App.screen.check(y, 'abc', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1')

[10.44060]

[10.44178]

  App.screen.check(y, 'abc', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1')

Replacement in source_text_tests.lua at line 1188 [48.3561]

B:BD[10.44213] → [10.44213:44331]

  App.screen.check(y, 'def', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2')

[10.44213]

[10.44331]

  App.screen.check(y, 'def', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2')

Replacement in source_text_tests.lua at line 1190 [48.3561]

B:BD[10.44366] → [10.44366:44485]

  App.screen.check(y, 'ghij', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')

[10.44366]

[10.44485]

  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')

Replacement in source_text_tests.lua at line 1193 [48.3561]

B:BD[10.44613] → [10.44613:45016]

  check_eq(Editor_state.screen_top1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos')

[10.44613]

[10.45016]

  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos')

Replacement in source_text_tests.lua at line 1198 [48.3561]

B:BD[10.45166] → [10.45166:45539]

  check_eq(Editor_state.screen_top1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line')
  check_eq(Editor_state.cursor1.pos, 5, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')

[10.45166]

[10.45539]

  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line')
  check_eq(Editor_state.cursor1.pos, 5, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')

Replacement in source_text_tests.lua at line 1202 [48.3561]

B:BD[10.45562] → [10.45562:45672]

  App.screen.check(y, 'ghij', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')

[10.45562]

[10.45672]

  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')

Replacement in source_text_tests.lua at line 1204 [48.3561]

B:BD[10.45707] → [10.45707:45815]

  App.screen.check(y, 'kl', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')

[10.45707]

[10.45815]

  App.screen.check(y, 'kl', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')

Replacement in source_text_tests.lua at line 1206 [48.3561]

B:BD[10.45850] → [10.45850:45959]

  App.screen.check(y, 'mno', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:3')

[10.45850]

[10.45959]

  App.screen.check(y, 'mno', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:3')

Replacement in source_text_tests.lua at line 1506 [48.3561]
B:BD[10.62089] → [10.62089:62135]
```
  edit.run_after_textinput(Editor_state, 'a')
```
[10.62089]
[10.62135]
```
  edit.run_after_text_input(Editor_state, 'a')
```

Replacement in source_text_tests.lua at line 1532 [48.3561]

B:BD[10.63648] → [10.63648:63786]

  edit.run_after_textinput(Editor_state, 'j')
  edit.run_after_textinput(Editor_state, 'k')
  edit.run_after_textinput(Editor_state, 'l')

[10.63648]

[10.63786]

  edit.run_after_text_input(Editor_state, 'j')
  edit.run_after_text_input(Editor_state, 'k')
  edit.run_after_text_input(Editor_state, 'l')

Replacement in source_text_tests.lua at line 1686 [48.3561]

B:BD[10.72388] → [10.72388:72526]

  edit.run_after_textinput(Editor_state, 's')
  edit.run_after_textinput(Editor_state, 't')
  edit.run_after_textinput(Editor_state, 'u')

[10.72388]

[10.72526]

  edit.run_after_text_input(Editor_state, 's')
  edit.run_after_text_input(Editor_state, 't')
  edit.run_after_text_input(Editor_state, 'u')

Deletion in source_text_tests.lua at line 1774 [48.3561]

B:BD[10.77177] → [53.13324:13324]

B:BD[48.43698] → [7.3134:3287]

BD:BD[48.43698] → [7.3134:3287]

B:BD[48.44229] → [7.3288:3405]

BD:BD[48.44229] → [7.3288:3405]

B:BD[48.44382] → [7.3406:3523]

BD:BD[48.44382] → [7.3406:3523]

B:BD[48.44535] → [7.3524:3642]

BD:BD[48.44535] → [7.3524:3642]

B:BD[48.44782] → [7.3643:4043]

BD:BD[48.44782] → [7.3643:4043]

B:BD[48.45335] → [7.4044:4414]

BD:BD[48.45335] → [7.4044:4414]

B:BD[48.45731] → [7.4415:4524]

BD:BD[48.45731] → [7.4415:4524]

B:BD[48.45876] → [7.4525:4632]

BD:BD[48.45876] → [7.4525:4632]

B:BD[48.46019] → [7.4633:4741]

BD:BD[48.46019] → [7.4633:4741]

B:BD[48.62258] → [7.4742:4789]

BD:BD[48.62258] → [7.4742:4789]

B:BD[48.63817] → [7.4790:4931]

BD:BD[48.63817] → [7.4790:4931]

B:BD[48.72557] → [7.4932:5073]

BD:BD[48.72557] → [7.4932:5073]

function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up()
  io.write('\ntest_pagedown_followed_by_down_arrow_does_not_scroll_screen_up')
  App.screen.check(y, 'abc', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1')
  App.screen.check(y, 'def', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2')
  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')
  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos')
  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line')
  check_eq(Editor_state.cursor1.pos, 5, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')
  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')
  App.screen.check(y, 'kl', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')
  App.screen.check(y, 'mno', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:3')
  edit.run_after_text_input(Editor_state, 'a')
  edit.run_after_text_input(Editor_state, 'j')
  edit.run_after_text_input(Editor_state, 'k')
  edit.run_after_text_input(Editor_state, 'l')
  edit.run_after_text_input(Editor_state, 's')
  edit.run_after_text_input(Editor_state, 't')
  edit.run_after_text_input(Editor_state, 'u')

Solving an order conflict in source_text_tests.lua at line 1774 [48.3561]
[10.77177]
[54.13325]
Replacement in source_text_tests.lua at line 1886 [48.3561]
B:BD[53.13740] → [53.13740:13786]
```
  edit.run_after_textinput(Editor_state, 'g')
```
[53.13740]
[53.13786]
```
  edit.run_after_text_input(Editor_state, 'g')
```
Deletion in source_text_tests.lua at line 1889 [48.3561]
B:BD[48.77761] → [7.5074:5121]
BD:BD[48.77761] → [7.5074:5121]
```
  edit.run_after_text_input(Editor_state, 'g')
```
Solving an order conflict in source_text_tests.lua at line 1889 [48.3561]
[53.13966]
[54.18813]
Deletion in source_text_tests.lua at line 1962 [48.3561]
B:BD[54.20227] → [54.20227:20273]
BD:BD[54.20227] → [54.20227:20273]
```
  edit.run_after_textinput(Editor_state, 'x')
```

Resurrecting zombie bytes in source_text_tests.lua at line 1963 [48.3561]

∅:∅[7.5169] → [54.20273:20765]

B:B[54.20273] → [54.20273:20765]

BD:B[54.20273] → [54.20273:20765]

  check_eq(Editor_state.lines[1].data, 'xbc', 'F - test_undo_restores_selection/baseline')
  check_nil(Editor_state.selection1.line, 'F - test_undo_restores_selection/baseline:selection')
  -- undo
  edit.run_after_keychord(Editor_state, 'C-z')
  edit.run_after_keychord(Editor_state, 'C-z')
  -- selection is restored
  check_eq(Editor_state.selection1.line, 1, 'F - test_undo_restores_selection/line')
  check_eq(Editor_state.selection1.pos, 2, 'F - test_undo_restores_selection/pos')
end

Replacement in source_text_tests.lua at line 1985 [48.3561]
B:BD[10.80574] → [10.80574:80620]
```
  edit.run_after_textinput(Editor_state, 'd')
```
[10.80574]
[10.80620]
```
  edit.run_after_text_input(Editor_state, 'd')
```
Replacement in source_text_tests.lua at line 1994 [48.3561]
B:BD[10.81001] → [10.81001:81048]
```
  edit.run_after_textinput(Editor_state, 'de')
```
[10.81001]
[10.81048]
```
  edit.run_after_text_input(Editor_state, 'de')
```
Replacement in source_text_tests.lua at line 2013 [48.3561]
B:BD[10.81746] → [10.81746:81792]
```
  edit.run_after_textinput(Editor_state, 'a')
```
[10.81746]
[10.81792]
```
  edit.run_after_text_input(Editor_state, 'a')
```
Replacement in source_text_tests.lua at line 2032 [48.3561]
B:BD[10.82480] → [10.82480:82526]
```
  edit.run_after_textinput(Editor_state, 'a')
```
[10.82480]
[10.82526]
```
  edit.run_after_text_input(Editor_state, 'a')
```
Replacement in source_text_tests.lua at line 2051 [48.3561]
B:BD[10.83222] → [10.83222:83268]
```
  edit.run_after_textinput(Editor_state, 'a')
```
[10.83222]
[10.83268]
```
  edit.run_after_text_input(Editor_state, 'a')
```
Deletion in source_text_tests.lua at line 2057 [48.3561]
B:BD[48.80804] → [7.5170:5217]
BD:BD[48.80804] → [7.5170:5217]
B:BD[48.81231] → [7.5218:5266]
BD:BD[48.81231] → [7.5218:5266]
B:BD[48.81976] → [7.5267:5314]
BD:BD[48.81976] → [7.5267:5314]
B:BD[48.82710] → [7.5315:5362]
BD:BD[48.82710] → [7.5315:5362]
B:BD[48.83452] → [7.5363:5410]
BD:BD[48.83452] → [7.5363:5410]
```
  edit.run_after_text_input(Editor_state, 'd')
  edit.run_after_text_input(Editor_state, 'de')
  edit.run_after_text_input(Editor_state, 'a')
  edit.run_after_text_input(Editor_state, 'a')
  edit.run_after_text_input(Editor_state, 'a')
```
Solving an order conflict in source_text_tests.lua at line 2057 [48.3561]
[10.83508]
Replacement in source_text.lua at line 356 [48.83786]
B:BD[10.96738] → [10.96738:96772]
```
function Text.textinput(State, t)
```
[10.96738]
[10.96772]
```
function Text.text_input(State, t)
```

Replacement in source_text.lua at line 384 [48.83786]

B:BD[10.98299] → [10.98299:98415]

-- Don't handle any keys here that would trigger love.textinput above.
function Text.keychord_pressed(State, chord)

[10.98299]

[53.16851]

-- Don't handle any keys here that would trigger text_input above.
function Text.keychord_press(State, chord)

Deletion in source_text.lua at line 446 [48.83786]
B:BD[10.101399] → [53.17096:17096]
B:BD[48.97167] → [7.5412:5447]
BD:BD[48.97167] → [7.5412:5447]
B:BD[48.98728] → [7.5448:5558]
BD:BD[48.98728] → [7.5448:5558]
BD:BD[48.98728] → [7.5448:5558]
```
function Text.text_input(State, t)
-- Don't handle any keys here that would trigger text_input above.
function Text.keychord_press(State, chord)
```
Solving an order conflict in source_text.lua at line 446 [48.83786]
[10.101399]
[55.3967]
Deletion in source_edit.lua at line 211 [48.152503]
B:BD[10.148629] → [10.148629:148722]
B:BD[10.148722] → [56.289:289]
```
function edit.mouse_pressed(State, x,y, mouse_button)
  if State.search_term then return end
```
Resurrecting zombie bytes in source_edit.lua at line 211 [48.152503]
B:B[48.157121] → [7.5563:5615]
BD:B[48.157121] → [7.5563:5615]
```
function edit.mouse_press(State, x,y, mouse_button)
```
Solving an order conflict in source_edit.lua at line 211 [48.152503]
[10.148629]
[7.5563]
Insertion in source_edit.lua at line 212 [48.152503]
[7.5615]
[55.20091]
```
  if State.search_term then return end
```
Deletion in source_edit.lua at line 246 [48.152503]
B:BD[55.20742] → [55.20742:20810]
BD:BD[55.20742] → [55.20742:20810]
```
        Drawing.mouse_pressed(State, line_index, x,y, mouse_button)
```
Resurrecting zombie bytes in source_edit.lua at line 247 [48.152503]
∅:∅[7.5749] → [55.20810:20834]
B:B[55.20810] → [55.20810:20834]
BD:B[55.20810] → [55.20810:20834]
```
        break
      end
```
Deletion in source_edit.lua at line 253 [48.152503]
B:BD[10.148953] → [10.148953:149008]
```
function edit.mouse_released(State, x,y, mouse_button)
```
Resurrecting zombie bytes in source_edit.lua at line 253 [48.152503]
B:B[48.157761] → [7.5750:5804]
BD:B[48.157761] → [7.5750:5804]
```
function edit.mouse_release(State, x,y, mouse_button)
```
Solving an order conflict in source_edit.lua at line 253 [48.152503]
[10.148953]
[7.5750]
Resurrecting zombie bytes in source_edit.lua at line 254 [48.152503]
∅:∅[7.5804] → [55.20835:20935]
∅:∅[10.149008] → [55.20835:20935]
B:B[48.157816] → [55.20835:20935]
BD:B[48.157816] → [55.20835:20935]
```
  if State.search_term then return end
--?   print('release')
  if State.lines.current_drawing then
```
Deletion in source_edit.lua at line 257 [48.152503]
B:BD[55.20935] → [55.20935:20988]
BD:BD[55.20935] → [55.20935:20988]
```
    Drawing.mouse_released(State, x,y, mouse_button)
```

Resurrecting zombie bytes in source_edit.lua at line 258 [48.152503]

∅:∅[7.5857] → [55.20988:21189]

B:B[55.20988] → [55.20988:21189]

BD:B[55.20988] → [55.20988:21189]

    schedule_save(State)
    if Drawing.before then
      record_undo_event(State, {before=Drawing.before, after=snapshot(State, State.lines.current_drawing_index)})
      Drawing.before = nil
    end

Resurrecting zombie bytes in source_edit.lua at line 287 [48.152503]
∅:∅[54.25355] → [55.21189:21195]
B:B[55.21189] → [55.21189:21195]
BD:B[55.21189] → [55.21189:21195]
```
  end
```
Replacement in source_edit.lua at line 290 [48.152503]
B:BD[10.149014] → [10.149014:149048]
```
function edit.textinput(State, t)
```
[10.149014]
[10.149153]
```
function edit.text_input(State, t)
```
Deletion in source_edit.lua at line 295 [48.152503]
B:BD[48.157821] → [7.5858:5893]
BD:BD[48.157821] → [7.5858:5893]
```
function edit.text_input(State, t)
```
Solving an order conflict in source_edit.lua at line 295 [48.152503]
[10.149282]
[55.21196]
Replacement in source_edit.lua at line 305 [48.152503]
B:BD[4.216] → [4.216:247]
```
      Text.textinput(State, t)
```
[4.216]
[4.247]
```
      Text.text_input(State, t)
```
Replacement in source_edit.lua at line 311 [48.152503]
B:BD[10.149353] → [10.149353:149403]
```
function edit.keychord_pressed(State, chord, key)
```
[10.149353]
[53.19085]
```
function edit.keychord_press(State, chord, key)
```
Deletion in source_edit.lua at line 366 [48.152503]
B:BD[53.19648] → [4.257:257]
B:BD[57.219] → [7.5894:5926]
BD:BD[57.219] → [7.5894:5926]
B:BD[48.158159] → [7.5927:5975]
BD:BD[48.158159] → [7.5927:5975]
BD:BD[48.158159] → [7.5927:5975]
```
      Text.text_input(State, t)
function edit.keychord_press(State, chord, key)
```
Solving an order conflict in source_edit.lua at line 366 [48.152503]
[53.19648]
[10.151033]
Deletion in source_edit.lua at line 464 [48.152503]
B:BD[55.22039] → [55.22039:22084]
BD:BD[55.22039] → [55.22039:22084]
```
      Drawing.keychord_pressed(State, chord)
```

Resurrecting zombie bytes in source_edit.lua at line 465 [48.152503]

∅:∅[7.6019] → [55.22084:23306]

B:B[55.22084] → [55.22084:23306]

BD:B[55.22084] → [55.22084:23306]

      record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})
      schedule_save(State)
    end
  elseif chord == 'escape' and not App.mouse_down(1) then
    for _,line in ipairs(State.lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end
  elseif State.current_drawing_mode == 'name' then
    if chord == 'return' then
      State.current_drawing_mode = State.previous_drawing_mode
      State.previous_drawing_mode = nil
    else
      local before = snapshot(State, State.lines.current_drawing_index)
      local drawing = State.lines.current_drawing
      local p = drawing.points[drawing.pending.target_point]
      if chord == 'escape' then
        p.name = nil
        record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
      elseif chord == 'backspace' then
        local len = utf8.len(p.name)
        local byte_offset = Text.offset(p.name, len-1)
        if len == 1 then byte_offset = 0 end
        p.name = string.sub(p.name, 1, byte_offset)
        record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
      end
    end
    schedule_save(State)

Replacement in source_edit.lua at line 496 [48.152503]
B:BD[10.154445] → [10.154445:154485]
```
    Text.keychord_pressed(State, chord)
```
[10.154445]
[10.154485]
```
    Text.keychord_press(State, chord)
```
Replacement in source_edit.lua at line 514 [48.152503]
B:BD[10.155059] → [10.155059:155108]
```
function edit.key_released(State, key, scancode)
```
[10.155059]
[10.155108]
```
function edit.key_release(State, key, scancode)
```
Replacement in source_edit.lua at line 542 [48.152503]
B:BD[10.155762] → [10.155762:155806]
```
-- all textinput events are also keypresses
```
[10.155762]
[10.155806]
```
-- all text_input events are also keypresses
```

Replacement in source_edit.lua at line 544 [48.152503]

B:BD[10.155846] → [10.155846:155981]

function edit.run_after_textinput(State, t)
  edit.keychord_pressed(State, t)
  edit.textinput(State, t)
  edit.key_released(State, t)

[10.155846]

[10.155981]

function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)

Replacement in source_edit.lua at line 553 [48.152503]
B:BD[10.156032] → [10.156032:156062]
```
-- not all keys are textinput
```
[10.156032]
[10.156062]
```
-- not all keys are text_input
```

Replacement in source_edit.lua at line 555 [48.152503]

B:BD[10.156109] → [10.156109:156181]

  edit.keychord_pressed(State, chord)
  edit.key_released(State, chord)

[10.156109]

[10.156181]

  edit.keychord_press(State, chord)
  edit.key_release(State, chord)

Replacement in source_edit.lua at line 564 [48.152503]
B:BD[10.156336] → [10.156336:156383]
```
  edit.mouse_pressed(State, x,y, mouse_button)
```
[10.156336]
[10.156383]
```
  edit.mouse_press(State, x,y, mouse_button)
```
Replacement in source_edit.lua at line 566 [48.152503]
B:BD[10.156427] → [10.156427:156475]
```
  edit.mouse_released(State, x,y, mouse_button)
```
[10.156427]
[10.156475]
```
  edit.mouse_release(State, x,y, mouse_button)
```
Replacement in source_edit.lua at line 574 [48.152503]
B:BD[10.156630] → [10.156630:156677]
```
  edit.mouse_pressed(State, x,y, mouse_button)
```
[10.156630]
[10.156677]
```
  edit.mouse_press(State, x,y, mouse_button)
```
Replacement in source_edit.lua at line 582 [48.152503]
B:BD[10.156836] → [10.156836:156884]
```
  edit.mouse_released(State, x,y, mouse_button)
```
[10.156836]
[10.156884]
```
  edit.mouse_release(State, x,y, mouse_button)
```
Deletion in source_edit.lua at line 587 [48.152503]
B:BD[10.156934] → [58.244:244]
B:BD[48.163298] → [7.6020:6058]
BD:BD[48.163298] → [7.6020:6058]
B:BD[48.163912] → [7.6059:6107]
BD:BD[48.163912] → [7.6059:6107]
B:BD[48.164615] → [7.6108:6153]
BD:BD[48.164615] → [7.6108:6153]
B:BD[48.164699] → [7.6154:6288]
BD:BD[48.164699] → [7.6154:6288]
B:BD[48.164885] → [7.6289:6320]
BD:BD[48.164885] → [7.6289:6320]
B:BD[48.164962] → [7.6321:6390]
BD:BD[48.164962] → [7.6321:6390]
B:BD[48.165189] → [7.6391:6436]
BD:BD[48.165189] → [7.6391:6436]
B:BD[48.165280] → [7.6437:6484]
BD:BD[48.165280] → [7.6437:6484]
B:BD[48.165483] → [7.6485:6530]
BD:BD[48.165483] → [7.6485:6530]
B:BD[48.165689] → [7.6531:6578]
BD:BD[48.165689] → [7.6531:6578]
```
    Text.keychord_press(State, chord)
function edit.key_release(State, key, scancode)
-- all text_input events are also keypresses
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
-- not all keys are text_input
  edit.keychord_press(State, chord)
  edit.key_release(State, chord)
  edit.mouse_press(State, x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
```
Solving an order conflict in source_edit.lua at line 587 [48.152503]
[10.156934]
Replacement in source.lua at line 195 [59.5]
B:BD[59.5936] → [59.5936:5970]
```
function source.filedropped(file)
```
[59.5936]
[59.5970]
```
function source.file_drop(file)
```

Replacement in source.lua at line 211 [59.5]

B:BD[59.6378] → [59.6378:6432]

-- a copy of source.filedropped when given a filename

[59.6378]

[59.6432]

-- a copy of source.file_drop when given a filename

Replacement in source.lua at line 283 [59.5]

B:BD[59.8357] → [59.8357:8406]

function source.mouse_pressed(x,y, mouse_button)

[59.8357]

[59.8406]

function source.mouse_press(x,y, mouse_button)

Replacement in source.lua at line 290 [59.5]

B:BD[60.1787] → [60.1787:1843]

    edit.mouse_pressed(Editor_state, x,y, mouse_button)

[60.1787]

[60.1843]

    edit.mouse_press(Editor_state, x,y, mouse_button)

Replacement in source.lua at line 299 [59.5]

B:BD[59.8879] → [61.88:144]

    edit.mouse_pressed(Editor_state, x,y, mouse_button)

[59.8879]

[62.242]

    edit.mouse_press(Editor_state, x,y, mouse_button)

Replacement in source.lua at line 306 [59.5]

B:BD[59.9174] → [61.145:213]

    log_browser.mouse_pressed(Log_browser_state, x,y, mouse_button)

[59.9174]

[61.213]

    log_browser.mouse_press(Log_browser_state, x,y, mouse_button)

Replacement in source.lua at line 311 [59.5]

B:BD[59.9185] → [59.9185:9235]

function source.mouse_released(x,y, mouse_button)

[59.9185]

[59.9235]

function source.mouse_release(x,y, mouse_button)

Replacement in source.lua at line 314 [59.5]

∅:D[63.704] → [59.9340:9404]

B:BD[59.9340] → [59.9340:9404]

    return edit.mouse_released(Editor_state, x,y, mouse_button)

[63.704]

[59.9404]

    return edit.mouse_release(Editor_state, x,y, mouse_button)

Replacement in source.lua at line 316 [59.5]

B:BD[59.9411] → [59.9411:9487]

    return log_browser.mouse_released(Log_browser_state, x,y, mouse_button)

[59.9411]

[59.9487]

    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button)

Replacement in source.lua at line 320 [59.5]
B:BD[59.9498] → [59.9498:9527]
```
function source.textinput(t)
```
[59.9498]
[59.9527]
```
function source.text_input(t)
```
Replacement in source.lua at line 323 [59.5]
B:BD[51.534] → [51.534:569]
```
    textinput_on_file_navigator(t)
```
[51.534]
[51.569]
```
    text_input_on_file_navigator(t)
```
Replacement in source.lua at line 327 [59.5]
∅:D[63.731] → [59.9632:9675]
B:BD[59.9632] → [59.9632:9675]
```
    return edit.textinput(Editor_state, t)
```
[63.731]
[59.9675]
```
    return edit.text_input(Editor_state, t)
```

Replacement in source.lua at line 329 [59.5]

B:BD[59.9682] → [59.9682:9737]

    return log_browser.textinput(Log_browser_state, t)

[59.9682]

[59.9737]

    return log_browser.text_input(Log_browser_state, t)

Replacement in source.lua at line 333 [59.5]
B:BD[59.9748] → [59.9748:9793]
```
function source.keychord_pressed(chord, key)
```
[59.9748]
[59.9793]
```
function source.keychord_press(chord, key)
```

Replacement in source.lua at line 336 [59.5]

B:BD[64.311] → [64.311:362]

    keychord_pressed_on_file_navigator(chord, key)

[64.311]

[64.362]

    keychord_press_on_file_navigator(chord, key)

Replacement in source.lua at line 377 [59.5]
∅:D[63.758] → [59.9898:9957]
B:BD[59.9898] → [59.9898:9957]
```
    return edit.keychord_pressed(Editor_state, chord, key)
```
[63.758]
[59.9957]
```
    return edit.keychord_press(Editor_state, chord, key)
```

Replacement in source.lua at line 379 [59.5]

B:BD[59.9964] → [59.9964:10035]

    return log_browser.keychord_pressed(Log_browser_state, chord, key)

[59.9964]

[59.10035]

    return log_browser.keychord_press(Log_browser_state, chord, key)

Replacement in source.lua at line 383 [59.5]
B:BD[59.10046] → [59.10046:10090]
```
function source.key_released(key, scancode)
```
[59.10046]
[59.10090]
```
function source.key_release(key, scancode)
```
Replacement in source.lua at line 386 [59.5]
∅:D[63.785] → [59.10195:10253]
B:BD[59.10195] → [59.10195:10253]
```
    return edit.key_released(Editor_state, key, scancode)
```
[63.785]
[59.10253]
```
    return edit.key_release(Editor_state, key, scancode)
```

Replacement in source.lua at line 388 [59.5]

B:BD[59.10260] → [59.10260:10339]

    return log_browser.keychord_pressed(Log_browser_state, chordkey, scancode)

[59.10260]

[59.10339]

    return log_browser.keychord_press(Log_browser_state, chordkey, scancode)

Replacement in pong.lua at line 65 [59.10555]
B:BD[59.11825] → [65.8:51]
```
function pong.keychord_pressed(chord, key)
```
[59.11825]
[59.11861]
```
function pong.keychord_press(chord, key)
```
Deletion in main.lua at line 101 [67.2]
B:BD[66.187701] → [7.8062:8093]
BD:BD[66.187701] → [7.8062:8093]
∅:D[7.8093] → [13.4429:4479]
B:BD[66.187732] → [13.4429:4479]
BD:BD[66.187732] → [13.4429:4479]
```
  if Current_app == 'run' then
    if run.file_drop then run.file_drop(file) end
```
Resurrecting zombie bytes in main.lua at line 101 [67.2]
B:B[13.4479] → [7.8094:8132]
BD:B[13.4479] → [7.8094:8132]
∅:∅[7.8132] → [13.4480:4536]
B:B[66.187824] → [13.4480:4536]
BD:B[66.187824] → [13.4480:4536]
```
  elseif Current_app == 'source' then
    if source.file_drop then source.file_drop(file) end
```

Insertion in main.lua at line 101 [67.2]

[66.187701]

[7.8094]

  if Current_app == 'pong' then
    if pong.file_drop then pong.file_drop(file) end

Deletion in main.lua at line 105 [67.2]

B:BD[68.1352] → [59.13016:13202]

  if Current_app == 'pong' then
    if pong.filedropped then pong.filedropped(file) end
  elseif Current_app == 'source' then
    if source.filedropped then source.filedropped(file) end

Deletion in main.lua at line 177 [67.2]
B:BD[59.14410] → [59.14410:14482]
B:BD[59.14482] → [11.698:698]
B:BD[66.189628] → [13.4578:4644]
BD:BD[66.189628] → [13.4578:4644]
```
    if pong.keychord_pressed then pong.keychord_pressed(chord, key) end
    if run.keychord_press then run.keychord_press(chord, key) end
```
Solving an order conflict in main.lua at line 177 [67.2]
[59.14410]

Insertion in main.lua at line 177 [67.2]

[0.7405]

[66.189698]

    if pong.keychord_press then pong.keychord_press(chord, key) end

Replacement in main.lua at line 192 [67.2]

B:BD[59.14761] → [59.14761:14810]

    if pong.textinput then pong.textinput(t) end

[59.14761]

[59.14810]

    if pong.text_input then pong.text_input(t) end

Replacement in main.lua at line 194 [67.2]

B:BD[59.14848] → [59.14848:14901]

    if source.textinput then source.textinput(t) end

[59.14848]

[69.1293]

    if source.text_input then source.text_input(t) end

Deletion in main.lua at line 198 [67.2]
B:BD[66.189982] → [13.4718:4767]
BD:BD[66.189982] → [13.4718:4767]
B:BD[66.190067] → [13.4768:4823]
BD:BD[66.190067] → [13.4768:4823]
```
    if run.text_input then run.text_input(t) end
    if source.text_input then source.text_input(t) end
```

Replacement in main.lua at line 207 [67.2]

B:BD[59.15103] → [59.15103:15167]

    if pong.key_released then pong.key_released(chord, key) end

[59.15103]

[59.15167]

    if pong.key_release then pong.key_release(chord, key) end

Deletion in main.lua at line 209 [67.2]
B:BD[59.15205] → [59.15205:15273]
B:BD[59.15273] → [11.720:720]
B:BD[66.190333] → [13.4824:4884]
BD:BD[66.190333] → [13.4824:4884]
```
    if source.key_released then source.key_released(chord, key) end
    if run.key_release then run.key_release(chord, key) end
```
Resurrecting zombie bytes in main.lua at line 209 [67.2]
B:B[66.190433] → [13.4885:4951]
BD:B[66.190433] → [13.4885:4951]
```
    if source.key_release then source.key_release(chord, key) end
```
Solving an order conflict in main.lua at line 209 [67.2]
[59.15205]
[13.4885]

Replacement in main.lua at line 218 [67.2]

B:BD[59.15405] → [59.15405:15478]

    if pong.mouse_pressed then pong.mouse_pressed(x,y, mouse_button) end

[59.15405]

[59.15478]

    if pong.mouse_press then pong.mouse_press(x,y, mouse_button) end

Replacement in main.lua at line 220 [67.2]

B:BD[59.15516] → [59.15516:15593]

    if source.mouse_pressed then source.mouse_pressed(x,y, mouse_button) end

[59.15516]

[11.722]

    if source.mouse_press then source.mouse_press(x,y, mouse_button) end

Replacement in main.lua at line 226 [67.2]
B:BD[70.4882] → [59.15648:15694]
```
function App.mousereleased(x,y, mouse_button)
```
[70.4882]
[59.15694]
```
function App.mouserelease(x,y, mouse_button)
```

Replacement in main.lua at line 228 [67.2]

B:BD[59.15726] → [59.15726:15801]

    if pong.mouse_released then pong.mouse_released(x,y, mouse_button) end

[59.15726]

[59.15801]

    if pong.mouse_release then pong.mouse_release(x,y, mouse_button) end

Replacement in main.lua at line 230 [67.2]

B:BD[59.15839] → [59.15839:15918]

    if source.mouse_released then source.mouse_released(x,y, mouse_button) end

[59.15839]

[59.15918]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end

Deletion in main.lua at line 248 [67.2]
B:BD[59.16150] → [11.724:724]
B:BD[48.190461] → [7.8324:8395]
BD:BD[48.190461] → [7.8324:8395]
B:BD[48.190572] → [7.8396:8473]
BD:BD[48.190572] → [7.8396:8473]
```
    if run.mouse_release then run.mouse_release(x,y, mouse_button) end
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
```
Solving an order conflict in main.lua at line 248 [67.2]
[59.16150]
[48.190651]
Deletion in main.lua at line 252 [67.2]
B:BD[48.190137] → [7.8176:8245]
BD:BD[48.190137] → [7.8176:8245]
B:BD[48.190246] → [7.8247:8247]
BD:BD[48.190246] → [7.8247:8247]
B:BD[7.8247] → [7.8248:8323]
BD:BD[7.8247] → [7.8248:8323]
```
    if run.mouse_pressed then run.mouse_press(x,y, mouse_button) end
    if source.mouse_pressed then source.mouse_press(x,y, mouse_button) end
```
Solving an order conflict in main.lua at line 252 [67.2]
[48.190716]

Replacement in log_browser.lua at line 197 [71.5]

B:BD[69.191] → [59.17663:17724]

function log_browser.mouse_pressed(State, x,y, mouse_button)

[69.191]

[59.17724]

function log_browser.mouse_press(State, x,y, mouse_button)

Replacement in log_browser.lua at line 265 [71.5]

B:BD[69.320] → [59.18284:18346]

function log_browser.mouse_released(State, x,y, mouse_button)

[72.1241]

[73.477]

function log_browser.mouse_release(State, x,y, mouse_button)

Replacement in log_browser.lua at line 268 [71.5]
B:BD[73.482] → [59.18347:18388]
```
function log_browser.textinput(State, t)
```
[73.482]
[69.360]
```
function log_browser.text_input(State, t)
```

Replacement in log_browser.lua at line 271 [71.5]

B:BD[69.365] → [59.18389:18446]

function log_browser.keychord_pressed(State, chord, key)

[69.365]

[74.152]

function log_browser.keychord_press(State, chord, key)

Replacement in log_browser.lua at line 322 [71.5]

B:BD[74.1029] → [59.18629:18684]

function log_browser.keyreleased(State, key, scancode)

[74.1029]

[69.477]

function log_browser.key_release(State, key, scancode)

Replacement in commands.lua at line 154 [75.459]
∅:D[60.2483] → [64.1349:1405]
B:BD[64.1349] → [64.1349:1405]
```
function keychord_pressed_on_file_navigator(chord, key)
```
[60.2483]
[51.3316]
```
function keychord_press_on_file_navigator(chord, key)
```
Replacement in commands.lua at line 292 [75.459]
B:BD[51.7618] → [51.7618:7658]
```
function textinput_on_file_navigator(t)
```
[51.7618]
[51.7658]
```
function text_input_on_file_navigator(t)
```

Merge text.love

Dependencies

In channels

Change contents

File deletion: text.lua, source_text.lua, text.lua

File deletion: edit.lua, source_edit.lua, edit.lua

File deletion: text_tests.lua, source_text_tests.lua, text_tests.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_tests.lua at line 68 [48.3561]

Deletion in source_text_tests.lua at line 146 [48.3561]

Solving an order conflict in source_text_tests.lua at line 146 [48.3561]

Deletion in source_text_tests.lua at line 148 [48.3561]

Replacement in source_text_tests.lua at line 270 [48.3561]

Replacement in source_text_tests.lua at line 274 [48.3561]

Replacement in source_text_tests.lua at line 276 [48.3561]

Replacement in source_text_tests.lua at line 279 [48.3561]

Replacement in source_text_tests.lua at line 289 [48.3561]

Replacement in source_text_tests.lua at line 303 [48.3561]

Replacement in source_text_tests.lua at line 308 [48.3561]

Replacement in source_text_tests.lua at line 323 [48.3561]

Replacement in source_text_tests.lua at line 328 [48.3561]

Replacement in source_text_tests.lua at line 342 [48.3561]

Replacement in source_text_tests.lua at line 399 [48.3561]

Replacement in source_text_tests.lua at line 413 [48.3561]

Replacement in source_text_tests.lua at line 418 [48.3561]

Replacement in source_text_tests.lua at line 433 [48.3561]

Replacement in source_text_tests.lua at line 609 [48.3561]

Replacement in source_text_tests.lua at line 649 [48.3561]

Replacement in source_text_tests.lua at line 668 [48.3561]

Replacement in source_text_tests.lua at line 772 [48.3561]

Deletion in source_text_tests.lua at line 860 [48.3561]

Replacement in source_text_tests.lua at line 1175 [48.3561]

Replacement in source_text_tests.lua at line 1186 [48.3561]

Replacement in source_text_tests.lua at line 1188 [48.3561]

Replacement in source_text_tests.lua at line 1190 [48.3561]

Replacement in source_text_tests.lua at line 1193 [48.3561]

Replacement in source_text_tests.lua at line 1198 [48.3561]

Replacement in source_text_tests.lua at line 1202 [48.3561]

Replacement in source_text_tests.lua at line 1204 [48.3561]

Replacement in source_text_tests.lua at line 1206 [48.3561]

Replacement in source_text_tests.lua at line 1506 [48.3561]

Replacement in source_text_tests.lua at line 1532 [48.3561]

Replacement in source_text_tests.lua at line 1686 [48.3561]

Deletion in source_text_tests.lua at line 1774 [48.3561]

Solving an order conflict in source_text_tests.lua at line 1774 [48.3561]

Replacement in source_text_tests.lua at line 1886 [48.3561]

Deletion in source_text_tests.lua at line 1889 [48.3561]

Solving an order conflict in source_text_tests.lua at line 1889 [48.3561]

Deletion in source_text_tests.lua at line 1962 [48.3561]

Resurrecting zombie bytes in source_text_tests.lua at line 1963 [48.3561]

Replacement in source_text_tests.lua at line 1985 [48.3561]

Replacement in source_text_tests.lua at line 1994 [48.3561]

Replacement in source_text_tests.lua at line 2013 [48.3561]

Replacement in source_text_tests.lua at line 2032 [48.3561]

Replacement in source_text_tests.lua at line 2051 [48.3561]

Deletion in source_text_tests.lua at line 2057 [48.3561]

Solving an order conflict in source_text_tests.lua at line 2057 [48.3561]

Replacement in source_text.lua at line 356 [48.83786]

Replacement in source_text.lua at line 384 [48.83786]

Deletion in source_text.lua at line 446 [48.83786]

Solving an order conflict in source_text.lua at line 446 [48.83786]

Deletion in source_edit.lua at line 211 [48.152503]

Resurrecting zombie bytes in source_edit.lua at line 211 [48.152503]

Solving an order conflict in source_edit.lua at line 211 [48.152503]

Insertion in source_edit.lua at line 212 [48.152503]

Deletion in source_edit.lua at line 246 [48.152503]

Resurrecting zombie bytes in source_edit.lua at line 247 [48.152503]

Deletion in source_edit.lua at line 253 [48.152503]

Resurrecting zombie bytes in source_edit.lua at line 253 [48.152503]

Solving an order conflict in source_edit.lua at line 253 [48.152503]

Resurrecting zombie bytes in source_edit.lua at line 254 [48.152503]

Deletion in source_edit.lua at line 257 [48.152503]

Resurrecting zombie bytes in source_edit.lua at line 258 [48.152503]

Resurrecting zombie bytes in source_edit.lua at line 287 [48.152503]

Replacement in source_edit.lua at line 290 [48.152503]

Deletion in source_edit.lua at line 295 [48.152503]

Solving an order conflict in source_edit.lua at line 295 [48.152503]