akkartik/sokoban.love - Change B4FAIVRAXKCS2ZZXYUHL7HHWVMDMG2MQ3BY6IOJARK7B5XTBAQNAC

Merge lines.love

Created by Kartik K. Agaram on February 1, 2023

B4FAIVRAXKCS2ZZXYUHL7HHWVMDMG2MQ3BY6IOJARK7B5XTBAQNAC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[4.2] → [5.83676:83721]

BFD:BFD[5.83721] → [5.3498:3498]

B:BD[5.47509] → [3.3361:4454]

∅:D[3.4454] → [5.47509:47557]

B:BD[6.32282] → [3.2259:3360]

∅:D[3.3360] → [5.38177:38234]

function test_up_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the up arrow the cursor moves up by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
end
function test_up_arrow_scrolls_up_by_one_line()
end
function test_down_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the down arrow the cursor moves down by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'down')
  check_eq(Editor_state.cursor1.line, 3, 'cursor')
end
function test_down_arrow_scrolls_down_by_one_line()

File deletion: source_text.lua, source_text.lua

BFD:BFD[4.2] → [5.147062:147101]

BFD:BFD[5.147101] → [5.83723:83723]

B:BD[8.8200] → [3.4513:4570]

∅:D[3.4570] → [8.8262:8919]

B:BD[8.7174] → [3.4456:4512]

∅:D[3.4512] → [8.7235:8019]

        State.cursor1 = {line=new_cursor_line, posB=nil}
        Text.populate_screen_line_starting_pos(State, State.cursor1.line)
        local prev_line_cache = State.line_cache[State.cursor1.line]
        local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]
        local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)
        local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)
        State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1
        break
      end
        State.cursor1 = {line=new_cursor_line, pos=nil}
        Text.populate_screen_line_starting_pos(State, State.cursor1.line)
        -- previous text line found, pick its final screen line
--?         print('has multiple screen lines')
        local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos
--?         print(#screen_line_starting_pos)
        screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]
        local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)
        local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)
        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1
        break
      end

Deletion in text_tests.lua at line 1001 [9.2]

B:BD[6.9436] → [3.2:1103]

end
function test_down_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the down arrow the cursor moves down by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'down')
  check_eq(Editor_state.cursor1.line, 3, 'cursor')

Deletion in text_tests.lua at line 1151 [9.2]

B:BD[9.19428] → [3.1104:2197]

function test_up_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the up arrow the cursor moves up by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
end

Replacement in text.lua at line 413 [11.1]

B:BD[10.4051] → [10.4051:4094]

      State.cursor1.line = new_cursor_line

[10.4051]

[10.4094]

      State.cursor1 = {line=new_cursor_line, pos=nil}

Deletion in text.lua at line 952 [11.1]
B:BD[12.657] → [3.2199:2255]
BD:BD[12.657] → [3.2199:2255]
```
        State.cursor1 = {line=new_cursor_line, pos=nil}
```
Solving an order conflict in text.lua at line 952 [11.1]
[13.442]

Insertion in source_text_tests.lua at line 1026 [14.3561]

[2.8922]

[14.38240]

end
function test_down_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the down arrow the cursor moves down by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'down')
  check_eq(Editor_state.cursor1.line, 3, 'cursor')

Insertion in source_text_tests.lua at line 1201 [14.3561]

[14.47572]

function test_up_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the up arrow the cursor moves up by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
end

Replacement in source_text.lua at line 683 [14.83786]

B:BD[15.5724] → [15.5724:5785]

        State.cursor1 = {line=State.cursor1.line-1, pos=nil}

[15.5724]

[15.5785]

        State.cursor1 = {line=new_cursor_line, pos=nil}

Replacement in source_text.lua at line 722 [14.83786]

B:BD[15.6750] → [15.6750:6812]

        State.cursor1 = {line=State.cursor1.line-1, posB=nil}

[15.6750]

[15.6812]

        State.cursor1 = {line=new_cursor_line, posB=nil}