akkartik/pothi.love - Change CRBLAWBOTECOU5MFURWCRBR43OO7NWIHP5LC35IMGTQKN73AUS6AC

resolve conflicts

Created by akkartik on June 11, 2024

CRBLAWBOTECOU5MFURWCRBR43OO7NWIHP5LC35IMGTQKN73AUS6AC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[9.2] → [10.83676:83721]

BFD:BFD[10.83721] → [10.3498:3498]

B:BD[11.2307] → [12.7:48]

B:BD[10.12513] → [7.7:67]

B:BD[10.12999] → [7.68:128]

B:BD[13.250] → [14.1844:1917]

B:BD[15.1185] → [7.129:189]

B:BD[15.2257] → [7.190:248]

B:BD[15.8436] → [14.1918:1991]

B:BD[16.509] → [14.1992:2065]

B:BD[15.9604] → [14.2066:2139]

B:BD[15.11105] → [14.2140:2213]

B:BD[10.67358] → [7.249:307]

∅:D[7.307] → [17.39693:39862]

∅:D[14.2213] → [15.11200:12097]

∅:D[14.2139] → [15.9699:10213]

∅:D[14.2065] → [16.604:908]

∅:D[14.1991] → [15.8531:8806]

∅:D[7.248] → [15.2306:2349]

∅:D[7.189] → [15.1236:1269]

∅:D[14.1917] → [13.345:433]

∅:D[7.128] → [17.24902:24998]

∅:D[7.67] → [17.24852:24901]

∅:D[12.48] → [11.2392:2651]

  App.screen.init{width=800, height=600}
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.run_after_keychord(Editor_state, 'S-right', 'right')
  edit.run_after_keychord(Editor_state, 'right', 'right')
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.run_after_keychord(Editor_state, 'right', 'right')
  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 6, 'cursor:pos')
  -- click on first location
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- hold down shift and click on a second location
  App.fake_key_press('lshift')
  edit.run_after_mouse_press(Editor_state, Editor_state.left+20,Editor_state.top+5, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1)
  -- hold down shift and click at a third location
  App.fake_key_press('lshift')
  edit.run_after_mouse_press(Editor_state, Editor_state.left+20,Editor_state.top+5, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height+5, 1)
  App.fake_key_release('lshift')
  -- selection is between first and third location. forget the second location, not the first.
  -- click on first location
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- hold down shift and click somewhere else
  App.fake_key_press('lshift')
  edit.run_after_mouse_press(Editor_state, Editor_state.left+20,Editor_state.top+5, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1)
  App.fake_key_release('lshift')
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
  -- press and hold on first location
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- drag and release somewhere else
  edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1)
  -- no change to data, selection is reset
  App.fake_key_release('lshift')
  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  check_eq(Editor_state.cursor1.line, 2, 'line')
  check_eq(Editor_state.cursor1.pos, 4, 'pos')
  check_eq(Editor_state.cursor1.pos, 9, 'check')
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{}
  Text.redraw_all(Editor_state)
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)
  -- cursor skips drawing to always remain on text

File deletion: source_text.lua, source_text.lua

BFD:BFD[9.2] → [10.147062:147101]

BFD:BFD[10.147101] → [10.83723:83723]

B:BD[10.83964] → [18.3892:3922]

B:BD[10.89103] → [18.3923:3934]

B:BD[10.97303] → [18.3935:4033]

B:BD[10.99353] → [18.4034:4134]

B:BD[10.99759] → [18.4135:4243]

B:BD[10.107499] → [18.4244:4556]

∅:D[14.3099] → [18.4556:4598]

B:BD[18.4556] → [18.4556:4598]

B:BD[10.107562] → [18.4599:4708]

B:BD[10.107719] → [18.4709:4847]

B:BD[11.6585] → [18.4848:4998]

B:BD[11.6769] → [18.4999:5049]

B:BD[10.107975] → [18.5050:5081]

B:BD[10.108366] → [18.5082:5131]

B:BD[10.109070] → [18.5132:5898]

B:BD[19.3470] → [18.5899:6005]

B:BD[10.115410] → [18.6006:6262]

B:BD[20.2975] → [18.6263:6381]

B:BD[10.118181] → [18.6382:6486]

B:BD[16.3828] → [12.50:98]

B:BD[16.4251] → [12.99:145]

B:BD[12.145] → [18.6487:6597]

∅:D[18.6597] → [12.209:222]

B:BD[12.209] → [12.209:222]

B:BD[12.222] → [18.6598:6695]

∅:D[18.6695] → [12.331:343]

B:BD[12.331] → [12.331:343]

B:BD[12.343] → [18.6696:6743]

∅:D[18.6743] → [12.396:803]

B:BD[12.396] → [12.396:803]

B:BD[20.3661] → [18.6744:6850]

B:BD[10.128343] → [18.6851:6960]

B:BD[10.128822] → [14.3100:3252]

B:BD[20.4141] → [14.3253:3419]

B:BD[10.130885] → [14.3420:3524]

B:BD[10.130960] → [14.3525:3544]

B:BD[10.142104] → [18.6961:7084]

B:BD[20.5854] → [18.7085:7613]

B:BD[10.145510] → [18.7614:7666]

B:BD[10.145640] → [18.7667:7723]

B:BD[10.145772] → [8.198:257]

∅:D[8.257] → [10.145985:146096]

∅:D[18.7666] → [10.145510:145640]

∅:D[18.7613] → [10.144205:144216]

∅:D[18.7084] → [10.142169:142294]

∅:D[14.3544] → [20.4319:4837]

∅:D[14.3524] → [10.130919:130960]

∅:D[14.3419] → [10.130218:130274]

∅:D[14.3252] → [20.4081:4141]

∅:D[18.6960] → [10.128576:128669]

∅:D[18.6850] → [10.127567:127795]

∅:D[12.803] → [10.125621:125738]

∅:D[12.98] → [16.3828:4230]

∅:D[18.6486] → [10.118338:118378]

∅:D[18.6381] → [10.115903:116648]

∅:D[18.6262] → [10.115469:115743]

∅:D[18.6005] → [19.3471:3520]

∅:D[18.5898] → [10.109098:109127]

∅:D[18.5131] → [20.2843:2918]

∅:D[18.5081] → [10.108331:108366]

∅:D[18.5049] → [10.107969:107975]

∅:D[18.4998] → [11.6761:6769]

∅:D[18.4847] → [11.6553:6585]

∅:D[18.4708] → [10.107643:107719]

∅:D[18.4598] → [10.107521:107562]

B:BD[18.4556] → [14.2214:2593]

∅:D[8.103] → [14.2593:2781]

B:BD[14.2593] → [14.2593:2781]

B:BD[14.2781] → [8.104:197]

∅:D[8.197] → [14.2874:3099]

B:BD[14.2874] → [14.2874:3099]

B:BD[14.2593] → [8.8:103]

∅:D[18.4243] → [10.99920:100077]

∅:D[18.4134] → [10.99506:99759]

∅:D[18.4033] → [10.97454:97835]

∅:D[18.3934] → [21.1985:2220]

∅:D[18.3922] → [22.8:91]

-- return y for the next line
  return y
--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?       print('=>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
  State.screen_top1 = Text.previous_screen_top1(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
function Text.previous_screen_top1(State)
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)
    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end
    if State.lines[loc2.line].mode == 'text' then
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[loc2.line].h, State.width)
    loc2 = Text.previous_screen_line(State, loc2)
  return Text.to1(State, loc2)
  State.screen_top1 = Text.screen_bottom1(State)
end
-- return the location of the start of the bottom-most line on screen
function Text.screen_bottom1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)
    end
    if y + State.line_height > App.screen.height then break end
    local next_loc2 = Text.next_screen_line(State, loc2)
    if Text.eq2(next_loc2, loc2) then break end
    loc2 = next_loc2
  end
  return Text.to1(State, loc2)
--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then
    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)
--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
  assert(State.lines[loc1.line].mode == 'text')
function Text.final_text_loc_on_screen(State)
  local screen_bottom1 = Text.screen_bottom1(State)
  if State.lines[screen_bottom1.line].mode == 'text' then
    return {
      line=screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
    }
  end
  local loc2 = Text.to2(State, screen_bottom1)
  while true do
    if State.lines[loc2.line].mode == 'text' then break end
    assert(loc2.line > 1 or loc2.screen_line > 1 and loc2.screen_pos > 1)  -- elsewhere we're making sure there's always at least one text line on screen
    loc2 = Text.previous_screen_line(State, loc2)
  end
  local result = Text.to1(State, loc2)
  result.pos = Text.pos_at_end_of_screen_line(State, result)
  return result
end
--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  if y < starty then return false end
  return y < starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)
  local starty = Text.starty(State, line_index)
  assert(my >= starty, 'failed to map y pixel to line')
  local y = starty
function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
end
  end
end
function Text.next_screen_line(State, loc2)
  if State.lines[loc2.line].mode == 'drawing' then
    return {line=loc2.line+1, screen_line=1, screen_pos=1}
  end
  Text.populate_screen_line_starting_pos(State, loc2.line)
  if loc2.screen_line >= #State.line_cache[loc2.line].screen_line_starting_pos then
    if loc2.line < #State.lines then
      return {line=loc2.line+1, screen_line=1, screen_pos=1}
    else
      return loc2
    end
  else
    return {line=loc2.line, screen_line=loc2.screen_line+1, screen_pos=1}
  local screen_bottom1 = Text.screen_bottom1(State)
  elseif State.cursor1.line >= screen_bottom1.line then
      State.cursor1 = Text.final_text_loc_on_screen(State)
    end
  end
end
-- slightly expensive since it redraws the screen
function Text.cursor_out_of_screen(State)
  if Text.lt1(State.cursor1, State.screen_top1) then
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  end
end
function Text.offset(s, pos1)
  if pos1 == 1 then return 1 end
  local result = utf8.offset(s, pos1)
  if result == nil then
  local start_screen_line_index = Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos)
  for screen_line_index = start_screen_line_index,#line_cache.screen_line_starting_pos do
    local screen_line_starting_pos = line_cache.screen_line_starting_pos[screen_line_index]
    local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)
--?     print('iter', y, screen_line_index, screen_line_starting_pos, string.sub(line.data, screen_line_starting_byte_offset))
  -- duplicate some logic from Text.draw
end
-- convert mx,my in pixels to schema-1 coordinates
  Text.populate_screen_line_starting_pos(State, line_index)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
--?   print('cursor pos '..tostring(State.cursor1.pos)..' is on the #'..tostring(top2.screen_line)..' screen line down')
  local y = App.screen.height - State.line_height
  -- duplicate some logic from love.draw
  while true do
function Text.cursor_at_final_screen_line(State)
  Text.populate_screen_line_starting_pos(State, State.cursor1.line)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  local most_recent_final_pos = utf8.len(State.lines[loc1.line].data)+1
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then
      return most_recent_final_pos
    end
    most_recent_final_pos = spos-1
  end
end
function Text.start_of_line(State)
--?     print('cursor is NOT at final screen line of its line')
    local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)
    Text.populate_screen_line_starting_pos(State, State.cursor1.line)
    local new_screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos[screen_line_index+1]
--?     print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))
    local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)
    local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)
--?       print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
--?       print('scroll up preserving cursor')
      Text.snap_cursor_to_bottom_of_screen(State)
--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
    end
  assert(State.cursor1.pos, 'cursor has no pos')
end
function Text.up(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
end
function Text.pagedown(State)
  end
    end
      y = y - State.line_height
  local y = App.screen.height - State.line_height
  while y >= State.top do
  -- duplicate some logic from love.draw
-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  if line_index < State.screen_top1.line then return end
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if loc2.line == line_index then return y end
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
    end
    if y + State.line_height > App.screen.height then break end
    local next_loc2 = Text.next_screen_line(State, loc2)
    if Text.eq2(next_loc2, loc2) then break end  -- end of file
    loc2 = next_loc2
  end
end
    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end
    end
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
  elseif chord == 'backspace' then
    Text.insert_at_cursor(State, '\t')
    if State.cursor_y > App.screen.height - State.line_height then
      Text.populate_screen_line_starting_pos(State, State.cursor1.line)
      Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
  Text.insert_at_cursor(State, t)
  if State.cursor_y > App.screen.height - State.line_height then
    Text.populate_screen_line_starting_pos(State, State.cursor1.line)
    Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
  end
  record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
end
function Text.insert_at_cursor(State, t)
end
function Text.screen_line(line, line_cache, i)
  local pos = line_cache.screen_line_starting_pos[i]
  local offset = Text.offset(line.data, pos)
  if i >= #line_cache.screen_line_starting_pos then
    return line.data:sub(offset)
function Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[9.2] → [10.165725:165764]

BFD:BFD[10.165764] → [10.152440:152440]

B:BD[10.154462] → [12.808:867]

B:BD[20.6260] → [12.868:946]

B:BD[10.156342] → [18.7997:8081]

B:BD[11.21906] → [14.3545:3627]

B:BD[16.5391] → [12.1047:1105]

B:BD[23.2277] → [12.1106:1163]

B:BD[24.32] → [18.8082:8129]

B:BD[15.32463] → [6.12:197]

B:BD[25.176] → [12.1164:1183]

∅:D[12.1183] → [10.165173:165217]

∅:D[6.197] → [15.32597:32661]

∅:D[18.8129] → [26.58:103]

∅:D[12.1163] → [23.2408:2445]

∅:D[12.1105] → [10.157693:157698]

∅:D[14.3627] → [11.22041:22192]

∅:D[18.8081] → [11.21245:21468]

∅:D[12.867] → [20.6171:6260]

    --
    -- On lines that are drawings, pos will be nil.
    cursor1 = {line=1, pos=1},  -- position of cursor; must be on a text line
      y = Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)
      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then
  State.selection1 = Text.final_text_loc_on_screen(State)
    State.cursor1 = Text.final_text_loc_on_screen(State)
    State.cursor1 = Text.screen_bottom1(State)
      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then
  edit.draw(State)
  App.fake_mouse_release(x,y, mouse_button)
    Text.delete_selection(State, State.left, State.right)
  end
    edit.put_cursor_on_next_text_line(State)
    edit.clean_up_mouse_press(State)
end
        State.lines.current_drawing_index = line_index
        State.lines.current_drawing = line
        Drawing.before = snapshot(State, line_index)
--?       print('=> y', y)
    elseif line.mode == 'drawing' then
      y = y+Drawing_padding_top
      Drawing.draw(State, line_index, y)
      y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom
    else
    screen_top1 = {line=1, pos=1},  -- position of start of screen line at top of screen

Deletion in text_tests.lua at line 16 [29.2]
B:BD[27.519] → [28.0:41]
BD:BD[27.519] → [28.0:41]
```
  App.screen.init{width=800, height=600}
```

Deletion in text.lua at line 359 [31.1]

B:BD[14.802] → [14.802:897]

    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end

Replacement in text.lua at line 360 [31.1]

B:BD[14.946] → [14.946:1186]

    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
    end

[14.946]

[14.1186]

    y = y + State.line_height

Deletion in text.lua at line 374 [31.1]
B:BD[32.2828] → [30.3890:3920]
BD:BD[32.2828] → [30.3890:3920]
```
    y = y - State.line_height
```
Resurrecting zombie bytes in text.lua at line 374 [31.1]
B:B[33.16711] → [18.817:905]
BD:B[33.16711] → [18.817:905]
B:B[34.563] → [18.1107:1157]
BD:B[34.563] → [18.1107:1157]
```
    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end
    loc2 = Text.previous_screen_line(State, loc2)
```

Replacement in text.lua at line 375 [31.1]

B:BD[18.905] → [18.905:955]

BD:BD[18.905] → [18.905:955]

B:BD[32.2923] → [18.956:1106]

BD:BD[32.2923] → [18.956:1106]

    if State.lines[loc2.line].mode == 'text' then
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[loc2.line].h, State.width)

[18.905]

[18.1107]

    y = y - State.line_height

Replacement in text.lua at line 395 [31.1]

B:BD[18.1539] → [18.1539:1779]

    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)
    end

[18.1539]

[18.1779]

    y = y + State.line_height

Replacement in text.lua at line 443 [31.1]

B:BD[19.1152] → [18.2007:2113]

BD:BD[19.1152] → [18.2007:2113]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

[36.1280]

[19.1153]

  print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Replacement in text.lua at line 447 [31.1]

B:BD[37.2960] → [37.2960:3017]

--?     print('cursor at final screen line of its line')

[37.2960]

[30.5428]

    print('cursor at final screen line of its line')

Replacement in text.lua at line 452 [31.1]
∅:D[38.263] → [30.5679:5714]
∅:D[39.4544] → [30.5679:5714]
B:BD[30.5679] → [30.5679:5714]
```
--?       print(State.cursor1.pos)
```
[38.263]
[38.265]
```
      print(State.cursor1.pos)
```

Replacement in text.lua at line 455 [31.1]

B:BD[18.2168] → [18.2168:2317]

--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)

[18.2168]

[18.2317]

  print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)

Replacement in text.lua at line 457 [31.1]

∅:D[18.2370] → [32.6537:6622]

B:BD[32.6537] → [32.6537:6622]

∅:D[32.6622] → [37.3515:3562]

∅:D[40.70860] → [37.3515:3562]

B:BD[37.3515] → [37.3515:3562]

--?       print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
--?       print('scroll up preserving cursor')

[18.2370]

[36.1451]

      print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
      print('scroll up preserving cursor')

Replacement in text.lua at line 460 [31.1]

∅:D[41.1385] → [32.6623:6707]

∅:D[36.1501] → [32.6623:6707]

B:BD[42.321] → [32.6623:6707]

--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

[36.1501]

[37.3680]

      print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

Replacement in text.lua at line 466 [31.1]
∅:D[43.73] → [37.3929:3993]
∅:D[18.2489] → [37.3929:3993]
B:BD[37.3929] → [37.3929:3993]
```
--?     print('cursor is NOT at final screen line of its line')
```
[18.2489]
[44.113]
```
    print('cursor is NOT at final screen line of its line')
```

Replacement in text.lua at line 470 [31.1]

∅:D[45.252] → [37.4192:4338]

∅:D[46.688] → [37.4192:4338]

∅:D[47.4875] → [37.4192:4338]

∅:D[32.6880] → [37.4192:4338]

∅:D[40.71160] → [37.4192:4338]

B:BD[37.4192] → [37.4192:4338]

--?     print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))

[45.252]

[39.4545]

    print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))

Replacement in text.lua at line 474 [31.1]
∅:D[48.901] → [32.7219:7293]
∅:D[36.1720] → [32.7219:7293]
B:BD[32.7219] → [32.7219:7293]
```
--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
```
[48.901]
[49.130]
```
    print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
```

Replacement in text.lua at line 476 [31.1]

B:BD[37.4631] → [37.4631:4678]

--?       print('scroll up preserving cursor')

[49.154]

[36.1721]

      print('scroll up preserving cursor')

Replacement in text.lua at line 478 [31.1]

∅:D[41.1449] → [32.7294:7378]

∅:D[36.1771] → [32.7294:7378]

B:BD[42.378] → [32.7294:7378]

--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

[36.1771]

[37.4796]

      print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

Replacement in text.lua at line 481 [31.1]

B:BD[37.4810] → [18.2490:2594]

--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

[37.4810]

[50.6091]

  print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Deletion in text.lua at line 601 [31.1]
B:BD[51.1362] → [28.42:90]
```
  assert(State.lines[loc1.line].mode == 'text')
```

Replacement in text.lua at line 616 [31.1]

B:BD[18.2647] → [18.2647:2705]

∅:D[18.2705] → [28.201:214]

B:BD[28.201] → [28.201:214]

B:BD[28.214] → [18.2706:2803]

∅:D[18.2803] → [28.323:335]

B:BD[28.323] → [28.323:335]

B:BD[28.335] → [18.2804:2851]

∅:D[18.2851] → [28.388:790]

B:BD[28.388] → [28.388:790]

  if State.lines[screen_bottom1.line].mode == 'text' then
    return {
      line=screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
    }
  end
  local loc2 = Text.to2(State, screen_bottom1)
  while true do
    if State.lines[loc2.line].mode == 'text' then break end
    assert(loc2.line > 1 or loc2.screen_line > 1 and loc2.screen_pos > 1)  -- elsewhere we're making sure there's always at least one text line on screen
    loc2 = Text.previous_screen_line(State, loc2)
  end
  local result = Text.to1(State, loc2)
  result.pos = Text.pos_at_end_of_screen_line(State, result)
  return result

[18.2647]

[28.790]

  return {
    line=screen_bottom1.line,
    pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
  }

Deletion in text.lua at line 890 [31.1]

B:BD[18.3248] → [18.3248:3364]

  if State.lines[loc2.line].mode == 'drawing' then
    return {line=loc2.line+1, screen_line=1, screen_pos=1}
  end

Replacement in source_text_tests.lua at line 19 [53.3561]
B:BD[52.902] → [52.902:942]
```
  App.screen.init{width=120, height=60}
```
[52.857]
[52.942]
```
  App.screen.init{width=800, height=600}
```
Deletion in source_text_tests.lua at line 78 [53.3561]
B:BD[53.5794] → [53.5794:5829]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 234 [53.3561]

B:BD[53.12576] → [54.963:1024]

  edit.run_after_keychord(Editor_state, 'M-right',  'right')

[53.12576]

[55.1492]

  edit.run_after_keychord(Editor_state, 'M-right', 'right')

Replacement in source_text_tests.lua at line 245 [53.3561]

B:BD[53.13062] → [54.1025:1086]

  edit.run_after_keychord(Editor_state, 'M-right',  'right')

[53.13062]

[55.1542]

  edit.run_after_keychord(Editor_state, 'M-right', 'right')

Deletion in source_text_tests.lua at line 257 [53.3561]
B:BD[53.13674] → [53.13674:13709]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 258 [53.3561]

B:BD[56.348] → [56.348:443]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[56.348]

[56.443]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 275 [53.3561]
B:BD[53.14352] → [53.14352:14387]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 294 [53.3561]
B:BD[53.15257] → [53.15257:15292]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 312 [53.3561]
B:BD[53.16067] → [53.16067:16102]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 330 [53.3561]
B:BD[57.589] → [57.589:624]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 347 [53.3561]
B:BD[53.16673] → [53.16673:16708]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 363 [53.3561]
B:BD[53.17353] → [53.17353:17388]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 379 [53.3561]
B:BD[53.18068] → [53.18068:18103]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 396 [53.3561]
B:BD[53.18881] → [53.18881:18916]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 414 [53.3561]
B:BD[53.19817] → [53.19817:19852]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 431 [53.3561]
B:BD[53.20690] → [53.20690:20725]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 448 [53.3561]
B:BD[53.21562] → [53.21562:21597]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 466 [53.3561]
B:BD[53.22418] → [53.22418:22453]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 488 [53.3561]
B:BD[53.23603] → [53.23603:23638]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 508 [53.3561]
B:BD[53.24697] → [53.24697:24732]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 531 [53.3561]
B:BD[53.25986] → [53.25986:26021]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 555 [53.3561]
B:BD[53.27425] → [53.27425:27460]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 573 [53.3561]
B:BD[58.1072] → [58.1072:1107]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 576 [53.3561]

B:BD[58.1185] → [54.1087:1148]

  edit.run_after_keychord(Editor_state, 'S-right',  'right')

[58.1185]

[58.1236]

  edit.run_after_keychord(Editor_state, 'S-right', 'right')

Deletion in source_text_tests.lua at line 595 [53.3561]
B:BD[58.2158] → [58.2158:2193]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 597 [53.3561]

B:BD[58.2257] → [54.1149:1208]

  edit.run_after_keychord(Editor_state, 'right',  'right')

[58.2257]

[58.2306]

  edit.run_after_keychord(Editor_state, 'right', 'right')

Deletion in source_text_tests.lua at line 612 [53.3561]
B:BD[58.2984] → [58.2984:3019]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 628 [53.3561]
B:BD[58.3703] → [58.3703:3738]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 649 [53.3561]
B:BD[58.4686] → [58.4686:4721]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 666 [53.3561]
B:BD[58.5422] → [58.5422:5457]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 683 [53.3561]
B:BD[58.6132] → [58.6132:6167]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 701 [53.3561]
B:BD[58.6896] → [58.6896:6931]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 724 [53.3561]
B:BD[53.28251] → [53.28251:28286]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 742 [53.3561]
B:BD[53.29042] → [53.29042:29077]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 770 [53.3561]
B:BD[53.30431] → [53.30431:30466]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 786 [53.3561]
B:BD[53.31336] → [53.31336:31371]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 814 [53.3561]
B:BD[58.8370] → [58.8370:8405]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 815 [53.3561]

B:BD[58.8436] → [58.8436:8531]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[58.8436]

[58.8531]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 833 [53.3561]
B:BD[59.443] → [59.443:478]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 834 [53.3561]

B:BD[59.509] → [59.509:604]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[59.509]

[59.604]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 850 [53.3561]
B:BD[59.1297] → [59.1297:1332]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 872 [53.3561]
B:BD[59.2356] → [59.2356:2391]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 892 [53.3561]
B:BD[58.9538] → [58.9538:9573]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 893 [53.3561]

B:BD[58.9604] → [58.9604:9699]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[58.9604]

[58.9699]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 916 [53.3561]
B:BD[58.11039] → [58.11039:11074]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 917 [53.3561]

B:BD[58.11105] → [58.11105:11200]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[58.11105]

[58.11200]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 945 [53.3561]
B:BD[59.3260] → [59.3260:3295]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 966 [53.3561]
B:BD[58.12935] → [58.12935:12970]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 981 [53.3561]
B:BD[53.33515] → [53.33515:33550]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1010 [53.3561]
B:BD[52.2889] → [52.2889:2924]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1033 [53.3561]
B:BD[53.34774] → [53.34774:34809]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1067 [53.3561]
B:BD[53.36454] → [53.36454:36489]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1081 [53.3561]
B:BD[53.37145] → [53.37145:37180]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1113 [53.3561]
B:BD[60.596] → [60.596:631]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1134 [53.3561]
B:BD[53.38690] → [53.38690:38725]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1161 [53.3561]
B:BD[53.40289] → [53.40289:40324]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1189 [53.3561]
B:BD[53.42159] → [53.42159:42194]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1216 [53.3561]
B:BD[53.44139] → [53.44139:44174]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1249 [53.3561]
B:BD[53.46546] → [53.46546:46581]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1280 [53.3561]
B:BD[60.1691] → [60.1691:1726]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1301 [53.3561]
B:BD[53.47994] → [53.47994:48029]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1328 [53.3561]
B:BD[61.427] → [61.427:462]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1349 [53.3561]
B:BD[53.49539] → [53.49539:49574]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1376 [53.3561]
B:BD[53.51223] → [53.51223:51258]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1405 [53.3561]
B:BD[53.53079] → [53.53079:53114]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1431 [53.3561]
B:BD[53.54424] → [53.54424:54459]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1455 [53.3561]
B:BD[53.55606] → [53.55606:55641]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1483 [53.3561]
B:BD[53.57342] → [53.57342:57377]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1509 [53.3561]
B:BD[53.58968] → [53.58968:59003]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1537 [53.3561]
B:BD[53.60645] → [53.60645:60680]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1559 [53.3561]
B:BD[53.62123] → [53.62123:62158]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1577 [53.3561]
B:BD[53.63304] → [53.63304:63339]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1606 [53.3561]
B:BD[53.65030] → [53.65030:65065]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1634 [53.3561]
B:BD[53.66760] → [53.66760:66795]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 1644 [53.3561]

B:BD[53.67421] → [54.3116:3175]

  edit.run_after_keychord(Editor_state, 'right',  'right')

[53.67421]

[55.16333]

  edit.run_after_keychord(Editor_state, 'right', 'right')

Deletion in source_text_tests.lua at line 1663 [53.3561]
B:BD[53.68570] → [53.68570:68605]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1691 [53.3561]
B:BD[53.70220] → [53.70220:70255]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1721 [53.3561]
B:BD[53.71991] → [53.71991:72026]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1754 [53.3561]
B:BD[53.74104] → [53.74104:74139]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1781 [53.3561]
B:BD[53.75586] → [53.75586:75621]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1915 [53.3561]
B:BD[53.77676] → [53.77676:77711]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1949 [53.3561]
B:BD[53.79164] → [53.79164:79199]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1987 [53.3561]
B:BD[58.20140] → [58.20140:20175]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2007 [53.3561]
B:BD[53.80671] → [53.80671:80706]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2033 [53.3561]
B:BD[53.81843] → [53.81843:81878]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2050 [53.3561]
B:BD[53.82577] → [53.82577:82612]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2067 [53.3561]
B:BD[53.83311] → [53.83311:83346]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text.lua at line 5 [53.83786]

B:BD[53.84027] → [62.48:128]

-- return y for the next line, and position of start of final screen line drawn

[53.84027]

[63.8]

-- return y for the next line

Deletion in source_text.lua at line 9 [53.83786]
B:BD[53.84250] → [53.84250:84274]
```
  line_cache.starty = y
```

Deletion in source_text.lua at line 11 [53.83786]

B:BD[61.1129] → [62.129:205]

  local final_screen_line_starting_pos = startpos  -- track value to return

Deletion in source_text.lua at line 25 [53.83786]
B:BD[53.87831] → [62.413:456]
```
      final_screen_line_starting_pos = pos
```
Replacement in source_text.lua at line 84 [53.83786]
B:BD[53.89166] → [62.1942:1985]
```
  return y, final_screen_line_starting_pos
```
[53.89166]
[62.1985]
```
  return y
```

Replacement in source_text.lua at line 208 [53.83786]

B:BD[53.97366] → [53.97366:97517]

--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[53.97366]

[53.97517]

--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 241 [53.83786]

B:BD[53.99416] → [53.99416:99569]

--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[53.99416]

[53.99569]

--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 246 [53.83786]

B:BD[53.99822] → [53.99822:99983]

--?       print('=>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[53.99822]

[53.99983]

--?       print('=>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 427 [53.83786]

B:BD[53.107562] → [53.107562:107584]

--?   print('pageup')

[53.107562]

[53.107584]

  State.screen_top1 = Text.previous_screen_top1(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)

Replacement in source_text.lua at line 437 [53.83786]

B:BD[53.107625] → [53.107625:107706]

  local top2 = Text.to2(State, State.screen_top1)
--?   print(App.screen.height)

[53.107625]

[53.107706]

  -- does not modify State (except to populate line_cache)
  if line_index < State.screen_top1.line then return end
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end
    if loc2.line == line_index then return y end
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
    end
    if y + State.line_height > App.screen.height then break end
    local next_loc2 = Text.next_screen_line(State, loc2)
    if Text.eq2(next_loc2, loc2) then break end  -- end of file
    loc2 = next_loc2
  end
end
function Text.previous_screen_top1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)

Replacement in source_text.lua at line 464 [53.83786]

B:BD[53.107782] → [53.107782:107845]

B:BD[53.107845] → [61.3441:3522]

∅:D[61.3522] → [52.5040:5103]

B:BD[53.107952] → [52.5040:5103]

--?     print(y, top2.line, top2.screen_line, top2.screen_pos)
    if State.screen_top1.line == 1 and State.screen_top1.pos == 1 then break end
    if State.lines[State.screen_top1.line].mode == 'text' then

[53.107782]

[52.5103]

    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end
    if State.lines[loc2.line].mode == 'text' then

Replacement in source_text.lua at line 467 [53.83786]

B:BD[52.5135] → [52.5135:5311]

    elseif State.lines[State.screen_top1.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width)

[52.5135]

[52.5311]

    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[loc2.line].h, State.width)

Replacement in source_text.lua at line 470 [53.83786]
∅:D[52.5319] → [53.107982:108032]
B:BD[53.107982] → [53.107982:108032]
```
    top2 = Text.previous_screen_line(State, top2)
```
[52.5319]
[53.108032]
```
    loc2 = Text.previous_screen_line(State, loc2)
```

Replacement in source_text.lua at line 472 [53.83786]

B:BD[53.108038] → [53.108038:108082]

B:BD[53.108082] → [61.3523:3598]

∅:D[61.3598] → [53.108186:108394]

B:BD[53.108186] → [53.108186:108394]

  State.screen_top1 = Text.to1(State, top2)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
--?   print(State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
--?   print('pageup end')

[53.108038]

[53.108394]

  return Text.to1(State, loc2)

Replacement in source_text.lua at line 476 [53.83786]

B:BD[53.108429] → [53.108429:108453]

B:BD[53.108453] → [64.9:94]

∅:D[64.94] → [53.108728:108805]

B:BD[53.108728] → [53.108728:108805]

--?   print('pagedown')
  State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
--?   print('setting top to', State.screen_top1.line, State.screen_top1.pos)

[53.108429]

[61.3945]

  State.screen_top1 = Text.screen_bottom1(State)

Deletion in source_text.lua at line 479 [53.83786]
B:BD[53.108993] → [53.108993:109040]
```
--?   print('top now', State.screen_top1.line)
```

Replacement in source_text.lua at line 480 [53.83786]

B:BD[53.109133] → [53.109133:109161]

--?   print('pagedown end')

[53.109133]

[53.109161]

end
-- return the location of the start of the bottom-most line on screen
function Text.screen_bottom1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)
    end
    if y + State.line_height > App.screen.height then break end
    local next_loc2 = Text.next_screen_line(State, loc2)
    if Text.eq2(next_loc2, loc2) then break end
    loc2 = next_loc2
  end
  return Text.to1(State, loc2)

Replacement in source_text.lua at line 547 [53.83786]

∅:D[35.1324] → [53.114899:115058]

∅:D[52.7527] → [53.114899:115058]

B:BD[53.114899] → [53.114899:115058]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[35.1324]

[35.1325]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Replacement in source_text.lua at line 564 [53.83786]

B:BD[53.115473] → [53.115473:115532]

    if State.cursor1.line > State.screen_bottom1.line then

[53.115473]

[53.115532]

    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then

Replacement in source_text.lua at line 574 [53.83786]

∅:D[61.4302] → [53.115896:115966]

B:BD[53.115896] → [53.115896:115966]

    local scroll_down = Text.le1(State.screen_bottom1, State.cursor1)

[61.4302]

[53.115966]

    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)

Replacement in source_text.lua at line 591 [53.83786]

B:BD[53.118244] → [53.118244:118401]

--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[53.118244]

[53.118401]

--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Insertion in source_text.lua at line 728 [53.83786]
[59.3828]
[59.3828]
```
  assert(State.lines[loc1.line].mode == 'text')
```

Insertion in source_text.lua at line 740 [53.83786]

[35.1819]

[59.4246]

end
function Text.final_text_loc_on_screen(State)
  local screen_bottom1 = Text.screen_bottom1(State)
  if State.lines[screen_bottom1.line].mode == 'text' then
    return {
      line=screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
    }
  end
  local loc2 = Text.to2(State, screen_bottom1)
  while true do
    if State.lines[loc2.line].mode == 'text' then break end
    assert(loc2.line > 1 or loc2.screen_line > 1 and loc2.screen_pos > 1)  -- elsewhere we're making sure there's always at least one text line on screen
    loc2 = Text.previous_screen_line(State, loc2)
  end
  local result = Text.to1(State, loc2)
  result.pos = Text.pos_at_end_of_screen_line(State, result)
  return result

Replacement in source_text.lua at line 801 [53.83786]

B:BD[61.5213] → [61.5213:5372]

--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[61.5213]

[53.127630]

--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 831 [53.83786]

B:BD[53.128406] → [61.5446:5608]

--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

[53.128406]

[53.128639]

--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 838 [53.83786]

B:BD[53.128885] → [53.128885:129011]

  if line_cache.starty == nil then return false end  -- outside current page
  if y < line_cache.starty then return false end

[53.128885]

[61.5609]

  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  if y < starty then return false end

Replacement in source_text.lua at line 842 [53.83786]

B:BD[61.5669] → [61.5669:5846]

  return y < line_cache.starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)

[61.5669]

[53.130281]

  return y < starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)

Replacement in source_text.lua at line 849 [53.83786]

B:BD[53.130948] → [35.2105:2172]

  assert(my >= line_cache.starty, 'failed to map y pixel to line')

[53.130948]

[53.130982]

  local starty = Text.starty(State, line_index)
  assert(my >= starty, 'failed to map y pixel to line')

Replacement in source_text.lua at line 852 [53.83786]
B:BD[53.131023] → [53.131023:131053]
```
  local y = line_cache.starty
```
[53.131023]
[61.5847]
```
  local y = starty
```

Insertion in source_text.lua at line 1036 [53.83786]

[61.7111]

[53.142162]

end
function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos

Insertion in source_text.lua at line 1065 [53.83786]

[53.144279]

[53.144721]

function Text.next_screen_line(State, loc2)
  if State.lines[loc2.line].mode == 'drawing' then
    return {line=loc2.line+1, screen_line=1, screen_pos=1}
  end
  Text.populate_screen_line_starting_pos(State, loc2.line)
  if loc2.screen_line >= #State.line_cache[loc2.line].screen_line_starting_pos then
    if loc2.line < #State.lines then
      return {line=loc2.line+1, screen_line=1, screen_pos=1}
    else
      return loc2
    end
  else
    return {line=loc2.line, screen_line=loc2.screen_line+1, screen_pos=1}
  end
end

Insertion in source_text.lua at line 1104 [53.83786]
[53.145573]
[53.145573]
```
  local screen_bottom1 = Text.screen_bottom1(State)
```

Replacement in source_text.lua at line 1107 [53.83786]

B:BD[53.145703] → [53.145703:145790]

  elseif State.cursor1.line >= State.screen_bottom1.line then
--?     print('too low')

[53.145703]

[53.145790]

  elseif State.cursor1.line >= screen_bottom1.line then

Replacement in source_text.lua at line 1109 [53.83786]

B:BD[53.145835] → [53.145835:145860]

B:BD[53.145860] → [61.7383:7562]

--?       print('tweak')
      State.cursor1 = {
          line=State.screen_bottom1.line,
          pos=Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, App.screen.height-5),
      }

[53.145835]

[53.146048]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Deletion in source_text.lua at line 1118 [53.83786]

B:BD[53.146203] → [53.146203:146513]

  -- this approach is cheaper and almost works, except on the final screen
  -- where file ends above bottom of screen
--?   local botpos = Text.pos_at_start_of_screen_line(State, State.cursor1)
--?   local botline1 = {line=State.cursor1.line, pos=botpos}
--?   return Text.lt1(State.screen_bottom1, botline1)

Deletion in source_edit.lua at line 36 [53.152503]
B:BD[52.17256] → [52.17256:17321]
```
    --    a (y) coord in pixels (updated while painting screen),
```
Deletion in source_edit.lua at line 56 [53.152503]
B:BD[53.153568] → [53.153568:153638]
```
    --   starty, the y coord in pixels the line starts rendering from
```
Insertion in source_edit.lua at line 69 [53.152503]
[53.154525]
[61.8099]
```
    --
    -- On lines that are drawings, pos will be nil.
```

Replacement in source_edit.lua at line 72 [53.152503]

B:BD[61.8188] → [61.8188:8337]

    cursor1 = {line=1, pos=1},  -- position of cursor
    screen_bottom1 = {line=1, pos=1},  -- position of start of screen line at bottom of screen

[61.8188]

[58.23290]

    cursor1 = {line=1, pos=1},  -- position of cursor; must be on a text line

Deletion in source_edit.lua at line 167 [53.152503]
B:BD[53.155825] → [59.4256:4301]
```
  local screen_bottom1 = {line=nil, pos=nil}
```
Deletion in source_edit.lua at line 172 [53.152503]
B:BD[53.156055] → [59.4302:4339]
```
    screen_bottom1.line = line_index
```

Replacement in source_edit.lua at line 198 [53.152503]

B:BD[53.156405] → [63.964:1068]

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

[53.156405]

[52.19795]

      y = Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)

Deletion in source_edit.lua at line 208 [53.152503]
B:BD[53.156588] → [59.4426:4466]
```
  State.screen_bottom1 = screen_bottom1
```

Replacement in source_edit.lua at line 280 [53.152503]

B:BD[52.20456] → [52.20456:20591]

      local line_cache = State.line_cache[line_index]
      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

[52.20456]

[52.20591]

      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then

Replacement in source_edit.lua at line 294 [53.152503]

B:BD[59.5131] → [59.5131:5267]

  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }

[59.5131]

[53.157756]

  State.selection1 = Text.final_text_loc_on_screen(State)

Replacement in source_edit.lua at line 332 [53.152503]

B:BD[57.1298] → [57.1298:1429]

    State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[57.1298]

[57.1429]

    State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_edit.lua at line 360 [53.152503]

B:BD[65.241] → [65.241:324]

    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}

[65.241]

[63.1115]

    State.cursor1 = Text.screen_bottom1(State)

Replacement in source_edit.lua at line 394 [53.152503]

B:BD[58.25659] → [66.11:198]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then

[58.25659]

[58.25793]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

Deletion in source_edit.lua at line 398 [53.152503]

B:BD[53.158237] → [67.11:118]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Deletion in source_edit.lua at line 502 [53.152503]
B:BD[52.21853] → [52.21853:21895]
```
    -- DON'T reset line_cache.starty here
```

Deletion in source_edit.lua at line 538 [53.152503]

B:BD[53.163191] → [53.163191:163298]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Insertion in source_edit.lua at line 592 [53.152503]
[56.6436]
[53.165236]
```
  edit.draw(State)
```
Deletion in source.lua at line 310 [53.165829]
∅:D[56.6890] → [53.175392:175506]
B:BD[53.175392] → [53.175392:175506]
```
    for _,line_cache in ipairs(Editor_state.line_cache) do line_cache.starty = nil end  -- just in case we scroll
```

Replacement in help.lua at line 3 [69.6622]

B:BD[68.2395] → [68.2395:2448]

  local line_cache = State.line_cache[drawing_index]

[68.2395]

[68.2448]

  local starty = Text.starty(State, drawing_index)

Replacement in help.lua at line 5 [69.6622]
B:BD[68.2472] → [68.2472:2505]
```
  local y = line_cache.starty+10
```
[68.2472]
[68.2505]
```
  local y = starty+10
```

Replacement in help.lua at line 51 [69.6622]

B:BD[68.4817] → [68.4817:4964]

  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))

[68.4817]

[68.4964]

  love.graphics.rectangle('fill', State.left,starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-starty))

Replacement in help.lua at line 56 [69.6622]

B:BD[68.5074] → [68.5074:5127]

  local line_cache = State.line_cache[drawing_index]

[68.5074]

[68.5127]

  local starty = Text.starty(State, drawing_index)

Replacement in help.lua at line 58 [69.6622]
B:BD[68.5151] → [68.5151:5184]
```
  local y = line_cache.starty+10
```
[68.5151]
[68.5184]
```
  local y = starty+10
```

Replacement in help.lua at line 132 [69.6622]

B:BD[68.8860] → [68.8860:9007]

  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))

[68.8860]

[68.9007]

  love.graphics.rectangle('fill', State.left,starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-starty))

Deletion in help.lua at line 147 [69.6622]
B:BD[68.9454] → [38.3567:3567]
B:BD[70.120] → [14.3653:3704]
BD:BD[70.120] → [14.3653:3704]
B:BD[71.313] → [14.3705:3727]
BD:BD[71.313] → [14.3705:3727]
B:BD[71.349] → [14.3728:3853]
BD:BD[71.349] → [14.3728:3853]
B:BD[70.461] → [14.3854:3905]
BD:BD[70.461] → [14.3854:3905]
B:BD[71.374] → [14.3906:3928]
BD:BD[71.374] → [14.3906:3928]
B:BD[71.410] → [14.3929:4054]
BD:BD[71.410] → [14.3929:4054]
```
  local starty = Text.starty(State, drawing_index)
  local y = starty+10
  love.graphics.rectangle('fill', State.left,starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-starty))
  local starty = Text.starty(State, drawing_index)
  local y = starty+10
  love.graphics.rectangle('fill', State.left,starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-starty))
```
Solving an order conflict in help.lua at line 147 [69.6622]
[68.9454]
[68.9485]
Deletion in edit.lua at line 110 [73.413]
B:BD[72.527] → [72.527:572]
```
  local screen_bottom1 = {line=nil, pos=nil}
```
Deletion in edit.lua at line 115 [73.413]
B:BD[72.802] → [72.802:839]
```
    screen_bottom1.line = line_index
```

Replacement in edit.lua at line 120 [73.413]

B:BD[72.1000] → [72.1000:1070]

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

[72.1000]

[72.1070]

    y = Text.draw(State, line_index, y, startpos)

Deletion in edit.lua at line 123 [73.413]
B:BD[72.1101] → [72.1101:1141]
```
  State.screen_bottom1 = screen_bottom1
```

Replacement in edit.lua at line 194 [73.413]

B:BD[72.3374] → [72.3374:3510]

  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }

[72.3374]

[72.3510]

  State.selection1 = Text.final_text_loc_on_screen(State)

Replacement in edit.lua at line 220 [73.413]

B:BD[57.2196] → [57.2196:2325]

  State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[57.2196]

[57.2325]

  State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in edit.lua at line 246 [73.413]

B:BD[72.4961] → [72.4961:5044]

    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}

[72.4961]

[72.5044]

    State.cursor1 = Text.screen_bottom1(State)
    edit.put_cursor_on_next_text_line(State)

Deletion in edit.lua at line 274 [73.413]

B:BD[72.6048] → [72.6048:6155]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Deletion in edit.lua at line 374 [73.413]

B:BD[72.10211] → [72.10211:10318]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Insertion in edit.lua at line 428 [73.413]
[72.11811]
[72.11811]
```
  edit.draw(State)
```
Deletion in edit.lua at line 451 [73.413]
B:BD[72.12430] → [5.178:178]
B:BD[24.182] → [18.8618:8665]
BD:BD[24.182] → [18.8618:8665]
B:BD[73.5239] → [18.8565:8617]
BD:BD[73.5239] → [18.8565:8617]
B:BD[73.8089] → [14.4055:4137]
BD:BD[73.8089] → [14.4055:4137]
B:BD[25.834] → [28.1152:1171]
BD:BD[25.834] → [28.1152:1171]
B:BD[23.3196] → [28.1094:1151]
BD:BD[23.3196] → [28.1094:1151]
B:BD[51.2459] → [28.1035:1093]
BD:BD[51.2459] → [28.1035:1093]
```
    State.cursor1 = Text.screen_bottom1(State)
      y = Text.draw(State, line_index, y, startpos)
      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then
  edit.draw(State)
    State.cursor1 = Text.final_text_loc_on_screen(State)
  State.selection1 = Text.final_text_loc_on_screen(State)
```
Solving an order conflict in edit.lua at line 451 [73.413]
[72.12430]
Replacement in drawing_tests.lua at line 6 [75.15]
B:BD[74.806] → [74.806:846]
```
  App.screen.init{width=120, height=60}
```
[74.762]
[74.846]
```
  App.screen.init{width=800, height=600}
```
Deletion in drawing_tests.lua at line 16 [75.15]
B:BD[74.1191] → [55.24354:24354]
B:BD[76.102] → [28.1172:1213]
BD:BD[76.102] → [28.1172:1213]
```
  App.screen.init{width=800, height=600}
```
Solving an order conflict in drawing_tests.lua at line 16 [75.15]
[74.1191]
[17.48537]
Deletion in drawing_tests.lua at line 35 [75.15]
B:BD[17.48768] → [17.48768:48866]
BD:BD[17.48768] → [17.48768:48866]
```
  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
```
Resurrecting zombie bytes in drawing_tests.lua at line 36 [75.15]
∅:∅[14.4231] → [17.48866:48986]
B:B[17.48866] → [17.48866:48986]
BD:B[17.48866] → [17.48866:48986]
```
  check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
  check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
```

Replacement in drawing_tests.lua at line 80 [75.15]

B:BD[55.25253] → [55.25253:25351]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.25253]

[55.25351]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 108 [75.15]

B:BD[55.25857] → [55.25857:25955]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.25857]

[55.25955]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 137 [75.15]

B:BD[55.26467] → [55.26467:26565]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.26467]

[55.26565]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 175 [75.15]

B:BD[55.26921] → [55.26921:27019]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.26921]

[55.27019]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 203 [75.15]

B:BD[55.27531] → [55.27531:27629]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.27531]

[55.27629]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 234 [75.15]

B:BD[55.28300] → [55.28300:28398]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.28300]

[55.28398]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 272 [75.15]

B:BD[55.29066] → [55.29066:29164]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.29066]

[55.29164]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 316 [75.15]

B:BD[55.29933] → [55.29933:30031]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.29933]

[55.30031]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Replacement in drawing_tests.lua at line 352 [75.15]

B:BD[55.30648] → [55.30648:30746]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')

[55.30648]

[55.30746]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Deletion in drawing_tests.lua at line 398 [75.15]

B:BD[74.24482] → [54.5415:5415]

B:BD[17.49651] → [14.4232:4325]

BD:BD[17.49651] → [14.4232:4325]

B:BD[17.50255] → [14.4326:4419]

BD:BD[17.50255] → [14.4326:4419]

B:BD[17.50865] → [14.4420:4513]

BD:BD[17.50865] → [14.4420:4513]

B:BD[17.51319] → [14.4514:4607]

BD:BD[17.51319] → [14.4514:4607]

B:BD[17.51929] → [14.4608:4701]

BD:BD[17.51929] → [14.4608:4701]

B:BD[17.52698] → [14.4702:4795]

BD:BD[17.52698] → [14.4702:4795]

B:BD[17.53464] → [14.4796:4889]

BD:BD[17.53464] → [14.4796:4889]

B:BD[17.54331] → [14.4890:4983]

BD:BD[17.54331] → [14.4890:4983]

B:BD[17.55046] → [14.4984:5077]

BD:BD[17.55046] → [14.4984:5077]

  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')

Solving an order conflict in drawing_tests.lua at line 398 [75.15]
[74.24482]
[17.55732]

Deletion in drawing.lua at line 9 [77.98]

B:BD[56.10263] → [56.10263:10337]

  local line_cache = State.line_cache[line_index]
  line_cache.starty = y

Replacement in drawing.lua at line 10 [77.98]

B:BD[56.10384] → [56.10384:10504]

  if pmx < State.right and pmy > line_cache.starty and pmy < line_cache.starty+Drawing.pixels(line.h, State.width) then

[56.10384]

[56.10504]

  local starty = Text.starty(State, line_index)
  if pmx < State.right and pmy > starty and pmy < starty+Drawing.pixels(line.h, State.width) then

Replacement in drawing.lua at line 13 [77.98]

B:BD[56.10530] → [56.10530:10645]

    love.graphics.rectangle('line', State.left,line_cache.starty, State.width,Drawing.pixels(line.h, State.width))

[56.10530]

[56.10645]

    love.graphics.rectangle('line', State.left,starty, State.width,Drawing.pixels(line.h, State.width))

Replacement in drawing.lua at line 15 [77.98]

B:BD[56.10690] → [56.10690:10766]

      icon[State.current_drawing_mode](State.right-22, line_cache.starty+4)

[56.10690]

[56.10766]

      icon[State.current_drawing_mode](State.right-22, starty+4)

Replacement in drawing.lua at line 17 [77.98]

B:BD[56.10775] → [56.10775:10852]

      icon[State.previous_drawing_mode](State.right-22, line_cache.starty+4)

[56.10775]

[56.10852]

      icon[State.previous_drawing_mode](State.right-22, starty+4)

Replacement in drawing.lua at line 32 [77.98]

B:BD[56.11157] → [56.11157:11220]

  local my = Drawing.coord(pmy-line_cache.starty, State.width)

[56.11157]

[56.11220]

  local my = Drawing.coord(pmy-starty, State.width)

Replacement in drawing.lua at line 40 [77.98]

B:BD[56.11408] → [56.11408:11487]

    Drawing.draw_shape(line, shape, line_cache.starty, State.left,State.right)

[56.11408]

[56.11487]

    Drawing.draw_shape(line, shape, starty, State.left,State.right)

Replacement in drawing.lua at line 44 [77.98]

B:BD[56.11570] → [56.11570:11653]

  local function py(y) return Drawing.pixels(y, State.width)+line_cache.starty end

[56.11570]

[56.11653]

  local function py(y) return Drawing.pixels(y, State.width)+starty end

Replacement in drawing.lua at line 73 [77.98]

B:BD[56.12713] → [56.12713:12791]

  Drawing.draw_pending_shape(line, line_cache.starty, State.left,State.right)

[56.12713]

[56.12791]

  Drawing.draw_pending_shape(line, starty, State.left,State.right)

Deletion in drawing.lua at line 126 [77.98]

B:BD[56.14879] → [35.8837:8837]

B:BD[78.1580] → [14.5078:5224]

BD:BD[78.1580] → [14.5078:5224]

B:BD[71.1052] → [14.5225:5329]

BD:BD[71.1052] → [14.5225:5329]

B:BD[79.363] → [14.5330:5395]

BD:BD[79.363] → [14.5330:5395]

B:BD[77.532] → [14.5396:5462]

BD:BD[77.532] → [14.5396:5462]

B:BD[80.73] → [14.5463:5515]

BD:BD[80.73] → [14.5463:5515]

B:BD[77.1083] → [14.5516:5584]

BD:BD[77.1083] → [14.5516:5584]

B:BD[81.93] → [14.5585:5657]

BD:BD[81.93] → [14.5585:5657]

B:BD[71.1279] → [14.5658:5725]

BD:BD[71.1279] → [14.5658:5725]

  local starty = Text.starty(State, line_index)
  if pmx < State.right and pmy > starty and pmy < starty+Drawing.pixels(line.h, State.width) then
    love.graphics.rectangle('line', State.left,starty, State.width,Drawing.pixels(line.h, State.width))
      icon[State.current_drawing_mode](State.right-22, starty+4)
      icon[State.previous_drawing_mode](State.right-22, starty+4)
  local my = Drawing.coord(pmy-starty, State.width)
    Drawing.draw_shape(line, shape, starty, State.left,State.right)
  local function py(y) return Drawing.pixels(y, State.width)+starty end
  Drawing.draw_pending_shape(line, starty, State.left,State.right)

Solving an order conflict in drawing.lua at line 126 [77.98]
[56.14879]
[82.7397]

Deletion in drawing.lua at line 209 [77.98]

B:BD[56.18373] → [56.18373:18669]

end
function Drawing.in_drawing(drawing, line_cache, x,y, left,right)
  if line_cache.starty == nil then return false end  -- outside current page
  local width = right-left
  return y >= line_cache.starty and y < line_cache.starty + Drawing.pixels(drawing.h, width) and x >= left and x < right

Deletion in drawing.lua at line 211 [77.98]
B:BD[56.18674] → [35.8906:8906]

Resurrecting zombie bytes in drawing.lua at line 211 [77.98]

B:B[83.646] → [14.5726:6150]

BD:B[83.646] → [14.5726:6150]

B:B[84.5462] → [14.6151:6250]

BD:B[84.5462] → [14.6151:6250]

function Drawing.in_current_drawing(State, x,y, left,right)
  return Drawing.in_drawing(State, State.lines.current_drawing_index, x,y, left,right)
end
function Drawing.in_drawing(State, line_index, x,y, left,right)
  assert(State.lines[line_index].mode == 'drawing')
  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  local drawing = State.lines[line_index]
  return y >= starty and y < starty + Drawing.pixels(drawing.h, width) and x >= left and x < right

Solving an order conflict in drawing.lua at line 211 [77.98]
[56.18674]
[14.5726]
Insertion in drawing.lua at line 220 [77.98]
[14.6150]
[14.6151]
```
  local width = right-left
```
Insertion in drawing.lua at line 222 [77.98]
[14.6250]
[25.883]
```
end
```

Replacement in drawing.lua at line 226 [77.98]

B:BD[56.18720] → [56.18720:18773]

  local line_cache = State.line_cache[drawing_index]

[56.18720]

[56.18773]

  local starty = Text.starty(State, drawing_index)

Replacement in drawing.lua at line 228 [77.98]

B:BD[56.18827] → [56.18827:18888]

  local cy = Drawing.coord(y-line_cache.starty, State.width)

[56.18827]

[56.18888]

  local cy = Drawing.coord(y-starty, State.width)

Deletion in drawing.lua at line 241 [77.98]
B:BD[85.2735] → [14.6251:6302]
BD:BD[85.2735] → [14.6251:6302]
B:BD[86.71] → [14.6303:6353]
BD:BD[86.71] → [14.6303:6353]
```
  local starty = Text.starty(State, drawing_index)
  local cy = Drawing.coord(y-starty, State.width)
```
Solving an order conflict in drawing.lua at line 241 [77.98]
[56.19797]
[82.7423]

Replacement in drawing.lua at line 253 [77.98]

B:BD[56.20157] → [56.20157:20230]

B:BD[56.20230] → [63.1480:1515]

  local line_cache = State.line_cache[State.lines.current_drawing_index]
  if line_cache.starty == nil then

[56.20157]

[63.1515]

  local starty = Text.starty(State, State.lines.current_drawing_index)
  if starty == nil then

Replacement in drawing.lua at line 263 [77.98]

B:BD[56.20370] → [56.20370:20433]

  local my = Drawing.coord(pmy-line_cache.starty, State.width)

[56.20370]

[56.20433]

  local my = Drawing.coord(pmy-starty, State.width)

Replacement in drawing.lua at line 265 [77.98]

B:BD[56.20461] → [56.20461:20546]

    if Drawing.in_drawing(drawing, line_cache, pmx,pmy, State.left,State.right) then

[56.20461]

[56.20546]

    if Drawing.in_current_drawing(State, pmx,pmy, State.left,State.right) then

Replacement in drawing.lua at line 275 [77.98]

B:BD[56.20939] → [56.20939:21025]

    if Drawing.in_drawing(drawing, line_cache, pmx, pmy, State.left,State.right) then

[56.20939]

[56.21025]

    if Drawing.in_current_drawing(State, pmx, pmy, State.left,State.right) then

Deletion in drawing.lua at line 303 [77.98]
B:BD[56.21692] → [35.9069:9069]
B:BD[87.179] → [14.6354:6449]
BD:BD[87.179] → [14.6354:6449]
BD:BD[87.179] → [14.6354:6449]
B:BD[88.134] → [14.6450:6502]
BD:BD[88.134] → [14.6450:6502]
B:BD[89.1613] → [14.6503:6582]
BD:BD[89.1613] → [14.6503:6582]
B:BD[87.457] → [14.6583:6663]
BD:BD[87.457] → [14.6583:6663]
```
  local starty = Text.starty(State, State.lines.current_drawing_index)
  if starty == nil then
  local my = Drawing.coord(pmy-starty, State.width)
    if Drawing.in_current_drawing(State, pmx,pmy, State.left,State.right) then
    if Drawing.in_current_drawing(State, pmx, pmy, State.left,State.right) then
```
Solving an order conflict in drawing.lua at line 303 [77.98]
[56.21692]
[82.7466]

Replacement in drawing.lua at line 313 [77.98]

B:BD[56.22064] → [56.22064:22139]

    local line_cache = State.line_cache[State.lines.current_drawing_index]

[56.22064]

[56.22139]

    local starty = Text.starty(State, State.lines.current_drawing_index)

Replacement in drawing.lua at line 322 [77.98]

B:BD[56.22495] → [56.22495:22607]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.22495]

[56.22607]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 329 [77.98]

B:BD[56.22947] → [56.22947:23059]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.22947]

[56.23059]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 337 [77.98]

B:BD[56.23470] → [56.23470:23594]

          App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), line_cache.starty+Drawing.pixels(p2.y, State.width))

[56.23470]

[56.23594]

          App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), starty+Drawing.pixels(p2.y, State.width))

Replacement in drawing.lua at line 341 [77.98]

B:BD[56.23714] → [56.23714:23826]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.23714]

[56.23826]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 349 [77.98]

B:BD[56.24225] → [56.24225:24339]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.24225]

[56.24339]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 364 [77.98]

B:BD[56.25207] → [56.25207:25321]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.25207]

[56.25321]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 375 [77.98]

B:BD[56.26037] → [56.26037:26149]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.26037]

[56.26149]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 382 [77.98]

B:BD[56.26475] → [56.26475:26587]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.26475]

[56.26587]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Deletion in drawing.lua at line 399 [77.98]

B:BD[56.27152] → [35.9377:9377]

B:BD[90.487] → [14.6664:6737]

BD:BD[90.487] → [14.6664:6737]

B:BD[91.227] → [14.6738:6839]

BD:BD[91.227] → [14.6738:6839]

B:BD[91.627] → [14.6840:6941]

BD:BD[91.627] → [14.6840:6941]

B:BD[91.1032] → [14.6942:7055]

BD:BD[91.1032] → [14.6942:7055]

B:BD[91.1231] → [14.7056:7157]

BD:BD[91.1231] → [14.7056:7157]

B:BD[91.1668] → [14.7158:7261]

BD:BD[91.1668] → [14.7158:7261]

B:BD[91.2366] → [14.7262:7365]

BD:BD[91.2366] → [14.7262:7365]

B:BD[91.2970] → [14.7366:7467]

BD:BD[91.2970] → [14.7366:7467]

B:BD[91.3348] → [14.7468:7569]

BD:BD[91.3348] → [14.7468:7569]

    local starty = Text.starty(State, State.lines.current_drawing_index)
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
          App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), starty+Drawing.pixels(p2.y, State.width))
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Solving an order conflict in drawing.lua at line 399 [77.98]
[56.27152]
[82.7524]

Replacement in drawing.lua at line 486 [77.98]

B:BD[56.31955] → [56.31955:32151]

    local _,drawing,line_cache = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)

[56.31955]

[56.32151]

    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)

Replacement in drawing.lua at line 492 [77.98]

B:BD[56.32415] → [56.32415:32611]

    local _,drawing,line_cache = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)

[56.32415]

[56.32611]

    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)

Replacement in drawing.lua at line 503 [77.98]

B:BD[56.33022] → [56.33022:33086]

    local _,drawing,line_cache = Drawing.current_drawing(State)

[56.33022]

[56.33086]

    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)

Replacement in drawing.lua at line 506 [77.98]

B:BD[56.33119] → [56.33119:33251]

    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)

[56.33119]

[56.33251]

    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)

Replacement in drawing.lua at line 522 [77.98]

B:BD[56.34209] → [56.34209:34295]

    local drawing_index,drawing,line_cache,i,p = Drawing.select_point_at_mouse(State)

[56.34209]

[56.34295]

    local drawing_index,drawing,_,i,p = Drawing.select_point_at_mouse(State)

Replacement in drawing.lua at line 533 [77.98]

B:BD[56.34740] → [56.34740:34836]

    local drawing_index,drawing,line_cache,point_index,p = Drawing.select_point_at_mouse(State)

[56.34740]

[56.34836]

    local drawing_index,drawing,_,point_index,p = Drawing.select_point_at_mouse(State)

Replacement in drawing.lua at line 631 [77.98]

B:BD[56.38422] → [56.38422:38610]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then
        return drawing_index,drawing,line_cache

[56.38422]

[56.38610]

      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then
        return drawing_index,drawing

Replacement in drawing.lua at line 643 [77.98]

B:BD[56.38838] → [56.38838:39090]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.38838]

[56.39090]

      local starty = Text.starty(State, drawing_index)
      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 648 [77.98]

B:BD[56.39218] → [56.39218:39264]

            return drawing,line_cache,i,shape

[56.39218]

[56.39264]

            return drawing,starty,i,shape

Replacement in drawing.lua at line 660 [77.98]

B:BD[56.39505] → [56.39505:39757]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[56.39505]

[56.39757]

      local starty = Text.starty(State, drawing_index)
      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Replacement in drawing.lua at line 665 [77.98]

B:BD[56.39888] → [56.39888:39948]

            return drawing_index,drawing,line_cache,i,point

[56.39888]

[56.39948]

            return drawing_index,drawing,starty,i,point

Replacement in drawing.lua at line 677 [77.98]

B:BD[56.40191] → [56.40191:40331]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then

[56.40191]

[56.40331]

      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then

Deletion in drawing.lua at line 751 [77.98]

B:BD[56.42200] → [38.3679:3679]

B:BD[92.690] → [14.7570:7809]

BD:BD[92.690] → [14.7570:7809]

B:BD[92.936] → [14.7810:8049]

BD:BD[92.936] → [14.7810:8049]

B:BD[92.1177] → [14.8050:8168]

BD:BD[92.1177] → [14.8050:8168]

B:BD[93.7258] → [14.8169:8290]

BD:BD[93.7258] → [14.8169:8290]

B:BD[89.2665] → [14.8291:8368]

BD:BD[89.2665] → [14.8291:8368]

B:BD[89.2771] → [14.8369:8456]

BD:BD[89.2771] → [14.8369:8456]

B:BD[69.19238] → [14.8457:8578]

BD:BD[69.19238] → [14.8457:8578]

B:BD[78.4159] → [14.8579:8819]

BD:BD[78.4159] → [14.8579:8819]

B:BD[69.19928] → [14.8820:8862]

BD:BD[69.19928] → [14.8820:8862]

B:BD[78.4208] → [14.8863:9103]

BD:BD[78.4208] → [14.8863:9103]

B:BD[84.8465] → [14.9104:9160]

BD:BD[84.8465] → [14.9104:9160]

B:BD[78.4257] → [14.9161:9245]

BD:BD[78.4257] → [14.9161:9245]

    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)
    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)
    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)
    local drawing_index,drawing,_,i,p = Drawing.select_point_at_mouse(State)
    local drawing_index,drawing,_,point_index,p = Drawing.select_point_at_mouse(State)
      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then
        return drawing_index,drawing
      local starty = Text.starty(State, drawing_index)
      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
            return drawing,starty,i,shape
      local starty = Text.starty(State, drawing_index)
      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
            return drawing_index,drawing,starty,i,point
      if Drawing.in_drawing(State, drawing_index, x,y, State.left,State.right) then

Solving an order conflict in drawing.lua at line 751 [77.98]
[56.42200]

Deletion in README.md at line 56 [95.6]

B:BD[94.204] → [28.1214:1456]

BD:BD[94.204] → [28.1214:1456]

* If you ever see a crash when clicking on the mouse, it might be because a
  mouse press and release need to happen in separate frames. Try pressing and
  releasing more slowly and let me know if that helps or not. This is klunky,
  sorry.

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

Deletion in text_tests.lua at line 16 [29.2]

Deletion in text.lua at line 359 [31.1]

Replacement in text.lua at line 360 [31.1]

Deletion in text.lua at line 374 [31.1]

Resurrecting zombie bytes in text.lua at line 374 [31.1]

Replacement in text.lua at line 375 [31.1]

Replacement in text.lua at line 395 [31.1]

Replacement in text.lua at line 443 [31.1]

Replacement in text.lua at line 447 [31.1]

Replacement in text.lua at line 452 [31.1]

Replacement in text.lua at line 455 [31.1]

Replacement in text.lua at line 457 [31.1]

Replacement in text.lua at line 460 [31.1]

Replacement in text.lua at line 466 [31.1]

Replacement in text.lua at line 470 [31.1]

Replacement in text.lua at line 474 [31.1]

Replacement in text.lua at line 476 [31.1]

Replacement in text.lua at line 478 [31.1]

Replacement in text.lua at line 481 [31.1]

Deletion in text.lua at line 601 [31.1]

Replacement in text.lua at line 616 [31.1]

Deletion in text.lua at line 890 [31.1]

Replacement in source_text_tests.lua at line 19 [53.3561]

Deletion in source_text_tests.lua at line 78 [53.3561]

Replacement in source_text_tests.lua at line 234 [53.3561]

Replacement in source_text_tests.lua at line 245 [53.3561]

Deletion in source_text_tests.lua at line 257 [53.3561]

Replacement in source_text_tests.lua at line 258 [53.3561]

Deletion in source_text_tests.lua at line 275 [53.3561]

Deletion in source_text_tests.lua at line 294 [53.3561]

Deletion in source_text_tests.lua at line 312 [53.3561]

Deletion in source_text_tests.lua at line 330 [53.3561]

Deletion in source_text_tests.lua at line 347 [53.3561]

Deletion in source_text_tests.lua at line 363 [53.3561]

Deletion in source_text_tests.lua at line 379 [53.3561]

Deletion in source_text_tests.lua at line 396 [53.3561]

Deletion in source_text_tests.lua at line 414 [53.3561]

Deletion in source_text_tests.lua at line 431 [53.3561]

Deletion in source_text_tests.lua at line 448 [53.3561]

Deletion in source_text_tests.lua at line 466 [53.3561]

Deletion in source_text_tests.lua at line 488 [53.3561]

Deletion in source_text_tests.lua at line 508 [53.3561]

Deletion in source_text_tests.lua at line 531 [53.3561]

Deletion in source_text_tests.lua at line 555 [53.3561]

Deletion in source_text_tests.lua at line 573 [53.3561]

Replacement in source_text_tests.lua at line 576 [53.3561]

Deletion in source_text_tests.lua at line 595 [53.3561]

Replacement in source_text_tests.lua at line 597 [53.3561]

Deletion in source_text_tests.lua at line 612 [53.3561]

Deletion in source_text_tests.lua at line 628 [53.3561]

Deletion in source_text_tests.lua at line 649 [53.3561]

Deletion in source_text_tests.lua at line 666 [53.3561]

Deletion in source_text_tests.lua at line 683 [53.3561]

Deletion in source_text_tests.lua at line 701 [53.3561]

Deletion in source_text_tests.lua at line 724 [53.3561]

Deletion in source_text_tests.lua at line 742 [53.3561]

Deletion in source_text_tests.lua at line 770 [53.3561]

Deletion in source_text_tests.lua at line 786 [53.3561]

Deletion in source_text_tests.lua at line 814 [53.3561]

Replacement in source_text_tests.lua at line 815 [53.3561]

Deletion in source_text_tests.lua at line 833 [53.3561]

Replacement in source_text_tests.lua at line 834 [53.3561]

Deletion in source_text_tests.lua at line 850 [53.3561]

Deletion in source_text_tests.lua at line 872 [53.3561]

Deletion in source_text_tests.lua at line 892 [53.3561]

Replacement in source_text_tests.lua at line 893 [53.3561]

Deletion in source_text_tests.lua at line 916 [53.3561]

Replacement in source_text_tests.lua at line 917 [53.3561]

Deletion in source_text_tests.lua at line 945 [53.3561]

Deletion in source_text_tests.lua at line 966 [53.3561]

Deletion in source_text_tests.lua at line 981 [53.3561]

Deletion in source_text_tests.lua at line 1010 [53.3561]

Deletion in source_text_tests.lua at line 1033 [53.3561]