akkartik/lines-polygon-experiment - Change 73XNHEKNPTKPDNB2B6QWLRRQJ37X5AZ6FTBVL5ZBTDYP2Z2K45PQC

Merge upstream into main

Created by Kartik K. Agaram on July 20, 2022

73XNHEKNPTKPDNB2B6QWLRRQJ37X5AZ6FTBVL5ZBTDYP2Z2K45PQC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 533 [5.2]

B:BD[4.981] → [2.2:156]

  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_on_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points

[4.981]

[6.2]

  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points

Deletion in text_tests.lua at line 1968 [5.2]

B:BD[5.43800] → [2.258:258]

B:BD[4.981] → [7.1685:1848]

BD:BD[4.981] → [7.1685:1848]

  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points

Solving an order conflict in text_tests.lua at line 1968 [5.2]
[5.43800]
Deletion in text.lua at line 99 [11.1]
B:BD[9.910] → [10.3:77]
BD:BD[9.910] → [10.3:77]
BD:BD[9.910] → [10.3:77]
B:BD[10.77] → [13.6:6]
BD:BD[10.77] → [13.6:6]
```
          local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos
```
Deletion in text.lua at line 839 [11.1]
B:BD[14.360] → [10.837:874]
BD:BD[14.360] → [10.837:874]
B:BD[10.874] → [13.22:22]
BD:BD[10.874] → [13.22:22]
```
  local offset = Text.offset(s, pos)
```

Merge upstream into main

Dependencies

In channels

Change contents

Replacement in text_tests.lua at line 533 [5.2]

Deletion in text_tests.lua at line 1968 [5.2]

Solving an order conflict in text_tests.lua at line 1968 [5.2]

Deletion in text.lua at line 99 [11.1]

Deletion in text.lua at line 839 [11.1]