resolve conflicts

akkartik

Nov 18, 2023, 7:47 PM

CZU7JNNAZLXHI5E2OELRN745LYRGHR2Q7RGDOJVHQQ75RXFK6CJQC

Dependencies

• [2] WST3AGMF Merge upstream into main
• [3] G3DLS5OU audit all asserts
• [4] LF7BWEG4 group all editor globals
• [5] MTJEVRJR add state arg to a few functions
• [6] W7JMT5V2 rip out most support for polygons
• [7] EAEGCJV5 rename
• [8] SPSW74Y5 add state arg to Text.keychord_pressed
• [9] 7CEOB56D Merge upstream into main
• [10] LSYLEVBD drop some redundant args when clearing the cache
• [11] XNFTJHC4 split keyboard handling between Text and Drawing
• [12] SRVDX4I5 local var
• [13] 2L5MEZV3 experiment: new edit namespace
• [14] YW2GO3U4 bugfix: crash in Text.up() after return
• [15] PTDO2SOT add state arg to schedule_save
• [16] MP2TBKU6 bugfix: crash in Text.up() after return
• [17] WDMPH4AN drop support for squares
• [18] WTDKUACN rectangle and square shapes
• [19] 27DROQW2 Merge upstream into main
• [20] PX7DDEMO autosave slightly less aggressively
• [21] AYE2VEGJ extract a couple of methods
• [*] BULPIBEG beginnings of a module for the text editor
• [*] BLWAYPKV extract a module

Change contents

• edit in text.lua at line 215
  [4.122]→[4.2810:2865](∅→∅),[4.2810]→[4.2810:2865](∅→∅),[4.122]→[4.2810:2865](∅→∅),[4.2810]→[4.2810:2865](∅→∅)
  − assert(Text.le1(State.screen_top1, State.cursor1))
• resurrect zombie in text.lua at line 216
  [3.916]→[4.83:108](∅→∅),[4.2865]→[4.83:108](∅→∅),[4.2865]→[4.83:108](∅→∅)
  + schedule_save(State)
• replacement in text.lua at line 908
  [4.1124]→[4.1124:1141](∅→∅)
  − assert(result)
  [4.1124]

  [4.1141]
  + assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")
• edit in text.lua at line 912
  [4.1124]→[3.2231:2317](∅→∅),[4.1124]→[3.2231:2317](∅→∅)
  − assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")
• resurrect zombie in edit.lua at line 84
  [4.97108]→[4.3955:3990](∅→∅),[4.97108]→[4.3955:3990](∅→∅)
  + current_drawing_submode = nil,
• edit in edit.lua at line 84
  [4.3184]

  [4.3955]
  + current_drawing_mode = 'line', -- one of the available shape modes
• edit in edit.lua at line 86
  [4.3184]→[3.7058:7130](∅→∅)
  − current_drawing_mode = 'line', -- one of the available shape modes
• resolve order conflict in edit.lua at line 86
  [4.3990]

  [4.97108]
• edit in drawing.lua at line 350
  [4.2272]→[3.7967:8077](∅→∅),[4.2272]→[3.7967:8077](∅→∅)
  − assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: square has too many pending vertices')
• edit in drawing.lua at line 535
  [4.11016]→[3.8159:8221](∅→∅),[4.11016]→[3.8159:8221](∅→∅)
  − assert(idx, 'point to delete is not in vertices')
• resolve order conflict in drawing.lua at line 535
  [4.985]

  [4.11243]