akkartik/wardley.love - Change 4VKEE43Z7MUPNIAOCK36INVBNHRTSWRRN37TIKRPXPH3DRKGHHAQC

bugfix

manifestation: clicking past end of a long, wrapping line containing non-ASCII would cause the cursor to disappear rather than position past end of screen line. Hitting enter would then throw an assertion with the following stack trace:

Error: text.lua:381: bad argument #2 to 'sub' (number expected, got nil) stack traceback: [love "boot.lua"]:345: in function <[love "boot.lua"]:341> [C]: in function 'sub' text.lua:381: in function 'insert_return' text.lua:179: in function 'keychord_pressed' main.lua:495: in function 'keychord_pressed' keychord.lua:10: in function <keychord.lua:5> app.lua:34: in function <app.lua:25> [C]: in function 'xpcall'

cause: the click caused a call to Text.to_pos_on_line whose result was not on a UTF-8 character boundary.

fix: make to_pos_on_line utf8-aware.

Created by Kartik K. Agaram on June 13, 2022

4VKEE43Z7MUPNIAOCK36INVBNHRTSWRRN37TIKRPXPH3DRKGHHAQC

Dependencies

In channels

main

Change contents

Insertion in text_tests.lua at line 130 [7.2]

[7.2457]

function test_click_on_wrapping_line_containing_non_ascii()
  io.write('\ntest_click_on_wrapping_line_containing_non_ascii')
  -- display a wrapping line containing non-ASCII
  App.screen.init{width=80, height=80}
                  --  12345678901234
  Lines = load_array{'madam I’m adam'}  -- notice the non-ASCII apostrophe
  Line_width = 75
  Cursor1 = {line=1, pos=1}
  Screen_top1 = {line=1, pos=1}
  Screen_bottom1 = {}
  App.draw()
  local y = Margin_top
  App.screen.check(y, 'madam ', 'F - test_click_on_wrapping_line_containing_non_ascii/baseline/screen:1')
  y = y + Line_height
  App.screen.check(y, 'I’m ada', 'F - test_click_on_wrapping_line_containing_non_ascii/baseline/screen:2')
  y = y + Line_height
  App.screen.check(y, 'm', 'F - test_click_on_wrapping_line_containing_non_ascii/baseline/screen:3')
  y = y + Line_height
  -- click past the end of it
  App.draw()
  App.run_after_mouse_click(App.screen.width-2,y-2, '1')
  -- cursor moves to end of line
  check_eq(Cursor1.pos, 15, 'F - test_click_on_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points
end

Replacement in text.lua at line 15 [10.1]
B:BD[8.50] → [9.1:26]
```
--?   print('text.draw')
```
[8.50]
[10.109]
```
--?   print('text.draw', line_index)
```

Insertion in text.lua at line 383 [10.1]

[11.296]

--?   print(Cursor1.line, Cursor1.pos, #Lines[Cursor1.line].data)
--?   print(Lines[Cursor1.line].data)
  assert(byte_offset)

Insertion in text.lua at line 684 [10.1]

[12.1193]

[2.3]

--?   print('Text.to_pos_on_line', mx, my, 'width', Line_width)

Insertion in text.lua at line 692 [10.1]

[13.133]

[14.3874]

--?     print('iter', y, screen_line_index, screen_line_starting_pos, string.sub(line.data, screen_line_starting_pos))

Insertion in text.lua at line 699 [10.1]

[13.437]

[12.1245]

--?         print('past end of non-final line; return')

Replacement in text.lua at line 702 [10.1]

∅:D[13.538] → [15.1121:1185]

B:BD[15.1121] → [15.1121:1185]

      local s = string.sub(line.data, screen_line_starting_pos)

[13.538]

[12.1312]

      local screen_line_starting_byte_offset = utf8.offset(line.data, screen_line_starting_pos)
      assert(screen_line_starting_byte_offset)
      local s = string.sub(line.data, screen_line_starting_byte_offset)
--?       print('return', mx, Text.nearest_cursor_pos(s, mx), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx) - 1)

Deletion in text.lua at line 884 [10.1]
B:BD[16.2480] → [16.2480:2503]
```
--?     print(x, frag)
```
Insertion in text.lua at line 886 [10.1]
[14.3986]
[16.2587]
```
--?     print(x, pos, frag, frag_width)
```
Deletion in text.lua at line 889 [10.1]
B:BD[16.2640] → [6.130:194]
```
--?       print(' ', #line.screen_line_starting_pos, line.data)
```

Insertion in text.lua at line 890 [10.1]

[6.249]

[16.2818]

--?       print('new screen line:', #line.screen_line_starting_pos, pos)

Insertion in main.lua at line 88 [18.2]
[4.240]
[17.8163]
```
Quit = false
```
Insertion in main.lua at line 106 [18.2]
[19.39]
[20.126]
```
--?   Line_width = 80
```
Insertion in main.lua at line 128 [18.2]
[3.73]
[21.40]
```
  Quit = true
```
Insertion in main.lua at line 266 [18.2]
[22.2875]
[18.416]
```
--?   if Quit then os.exit(1) end
```
Insertion in main.lua at line 329 [18.2]
[23.157]
[5.2423]
```
--?           print(Cursor1.line, Cursor1.pos)
```

bugfix

Dependencies

In channels

Change contents

Insertion in text_tests.lua at line 130 [7.2]

Replacement in text.lua at line 15 [10.1]

Insertion in text.lua at line 383 [10.1]

Insertion in text.lua at line 684 [10.1]

Insertion in text.lua at line 692 [10.1]

Insertion in text.lua at line 699 [10.1]

Replacement in text.lua at line 702 [10.1]

Deletion in text.lua at line 884 [10.1]

Insertion in text.lua at line 886 [10.1]

Deletion in text.lua at line 889 [10.1]

Insertion in text.lua at line 890 [10.1]

Insertion in main.lua at line 88 [18.2]

Insertion in main.lua at line 106 [18.2]

Insertion in main.lua at line 128 [18.2]

Insertion in main.lua at line 266 [18.2]

Insertion in main.lua at line 329 [18.2]