resolve conflicts

akkartik

Dec 9, 2023, 5:52 PM

RAS2WPUB3GBX3UJLNWJ6NO7BIQ47V7HOPIUGLMIHQN3DYQKQ4CHQC

Dependencies

• [2] CZU7JNNA resolve conflicts
• [3] AYG2PQCG fix a couple of asserts missed in the recent audit
• [4] EAEGCJV5 rename
• [5] YW2GO3U4 bugfix: crash in Text.up() after return
• [6] QCPXQ2E3 add state arg to a few functions
• [7] MP2TBKU6 bugfix: crash in Text.up() after return
• [8] LF7BWEG4 group all editor globals
• [9] 7CEOB56D Merge upstream into main
• [10] 27DROQW2 Merge upstream into main
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• replacement in text.lua at line 915
  [4.1095]→[4.1095:1118](∅→∅)
  − print(pos1, #s, s)
  [4.1005]

  [4.1118]
  + assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))
• edit in text.lua at line 917
  [4.1124]→[2.4:90](∅→∅)
  − assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")
• edit in text.lua at line 920
  [4.1005]→[3.4:174](∅→∅),[4.1005]→[3.4:174](∅→∅)
  − assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))