akkartik/sokoban.love - Change BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC

let's prevent the text cursor from ever getting on a drawing

Created by Kartik K. Agaram on May 17, 2022

BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC

Dependencies

In channels

main

Change contents

File addition: manual_tests (----------)

[5.2]

file load:
  cursor_line = 1
  first line is a drawing -> cursor_line = 2
create drawing -> cursor bumps down below drawing
backspace
  cursor_pos == 0, previous line is a drawing -> delete drawing, cursor still visible at start of line
  cursor_pos == 0, previous line is text -> join lines, cursor still at same character

Insertion in main.lua at line 75 [7.2]

[6.60]

[2.44]

  for i,line in ipairs(lines) do
    if line.mode == 'text' then
      cursor_line = i
    end
  end

Insertion in main.lua at line 88 [7.2]

[8.16]

[2.100]

  for i,line in ipairs(lines) do
    if line.mode == 'text' then
      cursor_line = i
    end
  end

Insertion in main.lua at line 110 [7.2]

[9.428]

[10.588]

                     if cursor_line >= i then
                       cursor_line = cursor_line+1
                     end

Replacement in main.lua at line 531 [7.2]

B:BD[11.66] → [9.1146:1377]

    if cursor_line > 1 and lines[cursor_line].data == '' then
      table.remove(lines, cursor_line)
      cursor_line = cursor_line-1
      if lines[cursor_line].mode == 'text' then
        cursor_pos = #lines[cursor_line].data+1

[11.66]

[9.1377]

    if cursor_pos > 1 then
      local byte_start = utf8.offset(lines[cursor_line].data, cursor_pos-1)
      local byte_end = utf8.offset(lines[cursor_line].data, cursor_pos)
      if byte_start then
        if byte_end then
          lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)..string.sub(lines[cursor_line].data, byte_end)
        else
          lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)
        end
        cursor_pos = cursor_pos-1
      end
    elseif cursor_line > 1 then
      if lines[cursor_line-1].mode == 'drawing' then
        table.remove(lines, cursor_line-1)

Replacement in main.lua at line 546 [7.2]

B:BD[9.1388] → [9.1388:1411]

        cursor_pos = 1

[9.1388]

[9.1411]

        -- join lines
        cursor_pos = utf8.len(lines[cursor_line-1].data)+1
        lines[cursor_line-1].data = lines[cursor_line-1].data..lines[cursor_line].data
        table.remove(lines, cursor_line)

Deletion in main.lua at line 551 [7.2]

B:BD[9.1421] → [9.1421:1537]

    elseif lines[cursor_line].mode == 'drawing' then
      table.remove(lines, cursor_line)  -- we'll add undo soon

Deletion in main.lua at line 552 [7.2]

B:BD[9.1571] → [9.1571:1711]

∅:D[12.99] → [11.139:148]

∅:D[9.1711] → [11.139:148]

B:BD[11.139] → [11.139:148]

B:BD[11.148] → [13.776:805]

B:BD[13.805] → [9.1712:1864]

∅:D[9.1864] → [13.947:1001]

B:BD[13.947] → [13.947:1001]

B:BD[13.1001] → [9.1865:2003]

∅:D[9.2003] → [13.1124:1139]

B:BD[13.1124] → [13.1124:1139]

B:BD[13.1139] → [9.2004:2095]

∅:D[9.2095] → [13.1220:1292]

B:BD[13.1220] → [13.1220:1292]

      if lines[cursor_line].mode == 'text' then
        cursor_pos = #lines[cursor_line].data+1
      else
        cursor_pos = 1
      end
    else
      if cursor_pos > 1 then
        local byte_start = utf8.offset(lines[cursor_line].data, cursor_pos-1)
        local byte_end = utf8.offset(lines[cursor_line].data, cursor_pos)
        if byte_start then
          if byte_end then
            lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)..string.sub(lines[cursor_line].data, byte_end)
          else
            lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)
          end
          cursor_pos = cursor_pos-1
        end
      end

Replacement in main.lua at line 580 [7.2]

B:BD[14.553] → [14.553:581]

B:BD[14.581] → [3.438:526]

∅:D[3.526] → [15.49:153]

B:BD[15.49] → [15.49:153]

    if cursor_line > 1 then
      if lines[cursor_line].mode == 'text' and lines[cursor_line-1].mode == 'text' then
        local old_x = cursor_x(lines[cursor_line].data, cursor_pos)
        cursor_line = cursor_line-1

[14.553]

[15.153]

    assert(lines[cursor_line].mode == 'text')
    local new_cursor_line = cursor_line
    while new_cursor_line > 1 do
      new_cursor_line = new_cursor_line-1
      if lines[new_cursor_line].mode == 'text' then
        local old_x = cursor_x(lines[new_cursor_line].data, cursor_pos)
        cursor_line = new_cursor_line

Replacement in main.lua at line 588 [7.2]
B:BD[15.237] → [15.237:248]
B:BD[15.248] → [4.1:37]
```
      else
        cursor_line = cursor_line-1
```
[15.237]
[15.284]
```
        break
```

Replacement in main.lua at line 592 [7.2]

B:BD[14.746] → [14.746:779]

B:BD[14.779] → [3.527:615]

∅:D[3.615] → [15.343:447]

B:BD[15.343] → [15.343:447]

    if cursor_line < #lines then
      if lines[cursor_line].mode == 'text' and lines[cursor_line+1].mode == 'text' then
        local old_x = cursor_x(lines[cursor_line].data, cursor_pos)
        cursor_line = cursor_line+1

[14.746]

[15.447]

    assert(lines[cursor_line].mode == 'text')
    local new_cursor_line = cursor_line
    while new_cursor_line < #lines do
      new_cursor_line = new_cursor_line+1
      if lines[new_cursor_line].mode == 'text' then
        local old_x = cursor_x(lines[new_cursor_line].data, cursor_pos)
        cursor_line = new_cursor_line

Replacement in main.lua at line 600 [7.2]
B:BD[15.531] → [15.531:578]
```
      else
        cursor_line = cursor_line+1
```
[15.531]
[15.578]
```
        break
```