akkartik/sokoban.love - Change ZPUQSPQPQFVRUIHGLAWW3IDBYODIWDHO62HAC3WWF5TM3CIJGHNQC

extract a few methods

Created by Kartik K. Agaram on May 29, 2022

ZPUQSPQPQFVRUIHGLAWW3IDBYODIWDHO62HAC3WWF5TM3CIJGHNQC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 982 [5.1]
B:BD[4.341] → [4.341:369]
```
  -- left/right by one word
```

Replacement in text.lua at line 984 [5.1]

B:BD[4.456] → [4.456:761]

    while true do
      Text.left()
      if Cursor1.pos == 1 then break end
      assert(Cursor1.pos > 1)
      local offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
      assert(offset > 1)
      if Lines[Cursor1.line].data:sub(offset-1,offset-1) == ' ' then
        break
      end
    end

[4.456]

[4.761]

    Text.word_left()

Replacement in text.lua at line 986 [5.1]

B:BD[4.794] → [4.794:1073]

    while true do
      Text.right()
      if Cursor1.pos > utf8.len(Lines[Cursor1.line].data) then break end
      local offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
      if Lines[Cursor1.line].data:sub(offset,offset) == ' ' then
        break
      end
    end

[4.794]

[4.1073]

    Text.word_right()

Replacement in text.lua at line 992 [5.1]

B:BD[6.3984] → [7.3647:3744]

∅:D[8.63] → [9.1:140]

∅:D[10.355] → [9.1:140]

∅:D[7.3744] → [9.1:140]

B:BD[6.4030] → [9.1:140]

B:BD[9.140] → [8.64:126]

∅:D[8.126] → [11.1:51]

B:BD[9.198] → [11.1:51]

B:BD[11.51] → [7.3745:3788]

∅:D[7.3788] → [12.225:358]

B:BD[12.225] → [12.225:358]

B:BD[12.358] → [2.1843:1891]

∅:D[2.1891] → [7.3789:3830]

B:BD[12.358] → [7.3789:3830]

B:BD[7.3830] → [2.1892:1955]

∅:D[2.1955] → [7.3830:3986]

B:BD[7.3830] → [7.3830:3986]

∅:D[13.85] → [14.151:183]

∅:D[7.3986] → [14.151:183]

B:BD[14.151] → [14.151:183]

B:BD[14.183] → [11.52:118]

B:BD[11.118] → [2.1956:2005]

∅:D[2.2005] → [7.3987:4075]

B:BD[11.118] → [7.3987:4075]

B:BD[7.4075] → [2.2006:2053]

∅:D[2.2053] → [14.270:359]

∅:D[7.4075] → [14.270:359]

B:BD[14.270] → [14.270:359]

B:BD[14.359] → [8.127:238]

B:BD[8.238] → [2.2054:2148]

∅:D[2.2148] → [7.4175:4333]

B:BD[7.4175] → [7.4175:4333]

∅:D[8.355] → [9.480:494]

∅:D[10.576] → [9.480:494]

∅:D[7.4333] → [9.480:494]

B:BD[9.480] → [9.480:494]

B:BD[9.494] → [7.4334:4509]

∅:D[13.177] → [12.556:594]

∅:D[14.595] → [12.556:594]

∅:D[7.4509] → [12.556:594]

B:BD[12.556] → [12.556:594]

B:BD[12.594] → [7.4510:4596]

∅:D[12.676] → [6.4415:4425]

∅:D[7.4596] → [6.4415:4425]

B:BD[6.4415] → [6.4415:4425]

B:BD[6.4425] → [12.677:686]

B:BD[12.686] → [11.119:168]

B:BD[11.168] → [8.356:422]

∅:D[8.422] → [12.860:896]

∅:D[9.557] → [12.860:896]

B:BD[12.860] → [12.860:896]

B:BD[12.896] → [7.4597:4700]

∅:D[7.4700] → [8.423:571]

B:BD[9.660] → [8.423:571]

B:BD[8.571] → [7.4701:4937]

∅:D[8.671] → [9.1073:1083]

∅:D[7.4937] → [9.1073:1083]

B:BD[9.1073] → [9.1073:1083]

B:BD[9.1083] → [7.4938:5174]

∅:D[8.732] → [15.268:276]

∅:D[12.1136] → [15.268:276]

∅:D[9.1312] → [15.268:276]

∅:D[7.5174] → [15.268:276]

B:BD[15.268] → [15.268:276]

    assert(Lines[Cursor1.line].mode == 'text')
--?     print('up', Cursor1.pos, Screen_top1.pos)
    local screen_line_index,screen_line_starting_pos = Text.pos_at_start_of_cursor_screen_line()
    if screen_line_starting_pos == 1 then
--?       print('cursor is at first screen line of its line')
      -- line is done; skip to previous text line
      local new_cursor_line = Cursor1.line
      while new_cursor_line > 1 do
        new_cursor_line = new_cursor_line-1
        if Lines[new_cursor_line].mode == 'text' then
--?           print('found previous text line')
          Cursor1.line = new_cursor_line
          Text.populate_screen_line_starting_pos(Cursor1.line)
          if Lines[Cursor1.line].screen_line_starting_pos == nil then
            Cursor1.pos = Text.nearest_cursor_pos(Lines[Cursor1.line].data, Cursor_x)
            break
          end
          -- previous text line found, pick its final screen line
--?           print('has multiple screen lines')
          local screen_line_starting_pos = Lines[Cursor1.line].screen_line_starting_pos
--?           print(#screen_line_starting_pos)
          screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]
--?           print('previous screen line starts at pos '..tostring(screen_line_starting_pos)..' of its line')
          if Screen_top1.line > Cursor1.line then
            Screen_top1.line = Cursor1.line
            Screen_top1.pos = screen_line_starting_pos
--?             print('pos of top of screen is also '..tostring(Screen_top1.pos)..' of the same line')
          end
          local s = string.sub(Lines[Cursor1.line].data, screen_line_starting_pos)
          Cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
          break
        end
      end
      if Cursor1.line < Screen_top1.line then
        Screen_top1.line = Cursor1.line
      end
    else
      -- move up one screen line in current line
--?       print('cursor is NOT at first screen line of its line')
      assert(screen_line_index > 1)
      new_screen_line_starting_pos = Lines[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))
      if Screen_top1.line == Cursor1.line and Screen_top1.pos == screen_line_starting_pos then
        Screen_top1.pos = new_screen_line_starting_pos
--?         print('also setting pos of top of screen to '..tostring(Screen_top1.pos))
      end
      local s = string.sub(Lines[Cursor1.line].data, new_screen_line_starting_pos)
      Cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?       print('cursor pos is now '..tostring(Cursor1.pos))
    end

[6.3984]

[6.4433]

    Text.up()

Replacement in text.lua at line 994 [5.1]

B:BD[6.4463] → [7.5175:5222]

B:BD[7.5222] → [16.507:632]

∅:D[17.420] → [18.267:360]

∅:D[16.632] → [18.267:360]

∅:D[7.5222] → [18.267:360]

B:BD[6.4509] → [18.267:360]

B:BD[18.360] → [16.633:692]

∅:D[16.692] → [17.476:497]

B:BD[17.476] → [17.476:497]

∅:D[17.497] → [7.5223:5266]

B:BD[8.798] → [7.5223:5266]

∅:D[7.5266] → [18.463:601]

B:BD[18.463] → [18.463:601]

B:BD[18.601] → [7.5267:5308]

    assert(Lines[Cursor1.line].mode == 'text')
--?     print('down', Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos, Screen_bottom1.line, Screen_bottom1.pos)
    if Text.cursor_at_final_screen_line() then
      -- line is done, skip to next text line
--?       print('cursor at final screen line of its line')
--?       os.exit(1)
      local new_cursor_line = Cursor1.line
      while new_cursor_line < #Lines do
        new_cursor_line = new_cursor_line+1
        if Lines[new_cursor_line].mode == 'text' then
          Cursor1.line = new_cursor_line

[6.4463]

[7.5308]

    Text.down()
  end
end
function Text.up()
  assert(Lines[Cursor1.line].mode == 'text')
--?   print('up', Cursor1.pos, Screen_top1.pos)
  local screen_line_index,screen_line_starting_pos = Text.pos_at_start_of_cursor_screen_line()
  if screen_line_starting_pos == 1 then
--?     print('cursor is at first screen line of its line')
    -- line is done; skip to previous text line
    local new_cursor_line = Cursor1.line
    while new_cursor_line > 1 do
      new_cursor_line = new_cursor_line-1
      if Lines[new_cursor_line].mode == 'text' then
--?         print('found previous text line')
        Cursor1.line = new_cursor_line
        Text.populate_screen_line_starting_pos(Cursor1.line)
        if Lines[Cursor1.line].screen_line_starting_pos == nil then

Deletion in text.lua at line 1014 [5.1]
B:BD[7.5392] → [16.693:726]
```
--?           print(Cursor1.pos)
```

Replacement in text.lua at line 1016 [5.1]

B:BD[18.779] → [18.779:789]

B:BD[7.5490] → [7.5490:5539]

B:BD[7.5539] → [16.727:802]

∅:D[17.599] → [7.5614:5654]

∅:D[16.802] → [7.5614:5654]

B:BD[7.5614] → [7.5614:5654]

B:BD[7.5654] → [16.803:852]

∅:D[19.130] → [18.874:922]

∅:D[17.645] → [18.874:922]

∅:D[16.852] → [18.874:922]

∅:D[8.1031] → [18.874:922]

B:BD[18.874] → [18.874:922]

B:BD[18.922] → [16.853:927]

∅:D[19.213] → [6.4899:4909]

∅:D[17.716] → [6.4899:4909]

∅:D[18.922] → [6.4899:4909]

∅:D[16.927] → [6.4899:4909]

∅:D[8.1118] → [6.4899:4909]

∅:D[7.5729] → [6.4899:4909]

B:BD[6.4899] → [6.4899:4909]

∅:D[20.64] → [18.923:983]

∅:D[8.1186] → [18.923:983]

∅:D[7.5800] → [18.923:983]

B:BD[6.4909] → [18.923:983]

B:BD[18.983] → [3.2260:2443]

      end
      if Cursor1.line > Screen_bottom1.line then
--?         print('screen top before:', Screen_top1.line, Screen_top1.pos)
        Screen_top1.line = Cursor1.line
--?         print('scroll up preserving cursor')
        Text.scroll_up_while_cursor_on_screen()
--?         print('screen top after:', Screen_top1.line, Screen_top1.pos)
      end
    else
      -- move down one screen line in current line
      local scroll_up = false
      if Cursor1.line > Screen_bottom1.line or (Cursor1.line == Screen_bottom1.line and Cursor1.pos >= Screen_bottom1.pos) then
        scroll_up = true

[18.779]

[3.2443]

        -- previous text line found, pick its final screen line
--?         print('has multiple screen lines')
        local screen_line_starting_pos = Lines[Cursor1.line].screen_line_starting_pos
--?         print(#screen_line_starting_pos)
        screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]
--?         print('previous screen line starts at pos '..tostring(screen_line_starting_pos)..' of its line')
        if Screen_top1.line > Cursor1.line then
          Screen_top1.line = Cursor1.line
          Screen_top1.pos = screen_line_starting_pos
--?           print('pos of top of screen is also '..tostring(Screen_top1.pos)..' of the same line')
        end
        local s = string.sub(Lines[Cursor1.line].data, screen_line_starting_pos)
        Cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
        break

Replacement in text.lua at line 1031 [5.1]

∅:D[3.2453] → [16.928:994]

B:BD[18.983] → [16.928:994]

∅:D[17.779] → [18.1045:1145]

∅:D[16.994] → [18.1045:1145]

∅:D[8.1253] → [18.1045:1145]

B:BD[18.1045] → [18.1045:1145]

B:BD[18.1145] → [7.5801:5904]

B:BD[7.5904] → [16.995:1143]

∅:D[17.924] → [7.5905:6080]

∅:D[16.1143] → [7.5905:6080]

B:BD[8.1402] → [7.5905:6080]

B:BD[7.6080] → [16.1144:1208]

B:BD[16.1208] → [3.2454:2689]

--?       print('cursor is NOT at final screen line of its line')
      local screen_line_index, screen_line_starting_pos = Text.pos_at_start_of_cursor_screen_line()
      new_screen_line_starting_pos = Lines[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 s = string.sub(Lines[Cursor1.line].data, new_screen_line_starting_pos)
      Cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?       print('cursor pos is now', Cursor1.line, Cursor1.pos)
      if scroll_up then
        Screen_top1.line = Cursor1.line
--?         print('scroll up preserving cursor')
        Text.scroll_up_while_cursor_on_screen()
--?         print('screen top after:', Screen_top1.line, Screen_top1.pos)

[3.2453]

[3.2689]

    end
    if Cursor1.line < Screen_top1.line then
      Screen_top1.line = Cursor1.line
    end
  else
    -- move up one screen line in current line
--?     print('cursor is NOT at first screen line of its line')
    assert(screen_line_index > 1)
    new_screen_line_starting_pos = Lines[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))
    if Screen_top1.line == Cursor1.line and Screen_top1.pos == screen_line_starting_pos then
      Screen_top1.pos = new_screen_line_starting_pos
--?       print('also setting pos of top of screen to '..tostring(Screen_top1.pos))
    end
    local s = string.sub(Lines[Cursor1.line].data, new_screen_line_starting_pos)
    Cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?     print('cursor pos is now '..tostring(Cursor1.pos))
  end
end
function Text.down()
  assert(Lines[Cursor1.line].mode == 'text')
--?   print('down', Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos, Screen_bottom1.line, Screen_bottom1.pos)
  if Text.cursor_at_final_screen_line() then
    -- line is done, skip to next text line
--?     print('cursor at final screen line of its line')
    local new_cursor_line = Cursor1.line
    while new_cursor_line < #Lines do
      new_cursor_line = new_cursor_line+1
      if Lines[new_cursor_line].mode == 'text' then
        Cursor1.line = new_cursor_line
        Cursor1.pos = Text.nearest_cursor_pos(Lines[Cursor1.line].data, Cursor_x)
--?         print(Cursor1.pos)
        break

Replacement in text.lua at line 1067 [5.1]

B:BD[9.1321] → [16.1330:1453]

--?     print('=>', Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos, Screen_bottom1.line, Screen_bottom1.pos)

[9.1321]

[21.36]

    if Cursor1.line > Screen_bottom1.line then
--?       print('screen top before:', Screen_top1.line, Screen_top1.pos)
      Screen_top1.line = Cursor1.line
--?       print('scroll up preserving cursor')
      Text.scroll_up_while_cursor_on_screen()
--?       print('screen top after:', Screen_top1.line, Screen_top1.pos)
    end
  else
    -- move down one screen line in current line
    local scroll_up = false
    if Cursor1.line > Screen_bottom1.line or (Cursor1.line == Screen_bottom1.line and Cursor1.pos >= Screen_bottom1.pos) then
      scroll_up = true
    end
--?     print('cursor is NOT at final screen line of its line')
    local screen_line_index, screen_line_starting_pos = Text.pos_at_start_of_cursor_screen_line()
    new_screen_line_starting_pos = Lines[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 s = string.sub(Lines[Cursor1.line].data, new_screen_line_starting_pos)
    Cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, Cursor_x) - 1
--?     print('cursor pos is now', Cursor1.line, Cursor1.pos)
    if scroll_up then
      Screen_top1.line = Cursor1.line
--?       print('scroll up preserving cursor')
      Text.scroll_up_while_cursor_on_screen()
--?       print('screen top after:', Screen_top1.line, Screen_top1.pos)
    end
  end
--?   print('=>', Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos, Screen_bottom1.line, Screen_bottom1.pos)
end
function Text.word_left()
  while true do
    Text.left()
    if Cursor1.pos == 1 then break end
    assert(Cursor1.pos > 1)
    local offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
    assert(offset > 1)
    if Lines[Cursor1.line].data:sub(offset-1,offset-1) == ' ' then
      break
    end
  end
end
function Text.word_right()
  while true do
    Text.right()
    if Cursor1.pos > utf8.len(Lines[Cursor1.line].data) then break end
    local offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
    if Lines[Cursor1.line].data:sub(offset,offset) == ' ' then
      break
    end