resolve conflicts

akkartik

Sep 1, 2024, 8:19 AM

FBBHEUQNDHGZQES6GC3VW55DXILRP7PYYXNLQF3HGHKYLUGWAUBQC

Dependencies

• [2] QZUFJMD5 resolve conflicts
• [3] 237LRHDO clean up Drawing.before after creating undo event
• [4] 6TBU3VTN explicitly state when operations manage undo
• [5] WYK3HCQD clean up some issues I now feel confident about
• [6] LNUHQOGH start passing in Editor_state explicitly
• [7] K2X6G75Z start writing some tests for drawings
• [8] K6DTOGOQ flip return value of button handlers
• [9] D4B52CQ2 Merge lines.love
• [10] 73OCE2MC after much struggle, a brute-force undo
• [11] AVTNUQYR basic test-enabled framework
• [12] UTDSCN3G Merge lines.love
• [13] JOPVPUSA editing source code from within the app
• [14] R2ASHK5C fix a bad merge
• [15] 6LJZN727 handle chords
• [16] HWTLXESC Merge lines.love
• [17] 4J3Y3DJW pijul bug: redo upstream change
• [18] 34TC5SYK record another known issue I don't know how to fix yet
• [19] RXMHAZ6V resolve conflicts
• [20] BLWAYPKV extract a module
• [21] GX5PD3CL consistently schedule_save after all mutations
• [22] FPY4LO2W make a few names consistent with snake_case
• [23] OTIBCAUJ love2d scaffold
• [24] 2L5MEZV3 experiment: new edit namespace
• [25] IFTYOERM line.y -> line_cache.starty in a few more places
• [26] CQVWNL4M resolve conflicts
• [27] LWPFEZBI Merge lines.love
• [28] OI4FPFIN support drawings in the source editor
• [29] JUU6KXPC bugfix: don't clear selection on M-arrow
• [30] 3XNFQDDN Merge lines.love
• [31] UHB4GARJ left/right margin -> left/right coordinates
• [32] ED4Z6ORC cleaner API for file-system access
• [33] TYLURRX3 resolve conflicts
• [34] IDGP4BJZ new known issue with drawings
• [35] VHUNJHXB Merge lines.love
• [36] MBAJPTDJ resolve conflicts
• [37] XX7G2FFJ intermingle freehand line drawings with text
• [38] TMWSQNZD bugfix in source editor: don't clear selection on M-arrow
• [39] LXTTOB33 extract a couple of files
• [40] SCOXD4EO Merge lines.love
• [41] TLOAPLBJ add a license
• [42] VXORMHME delete experimental REPL
• [43] MTIS2XTC affirm a priority
• [44] LF7BWEG4 group all editor globals
• [45] 4SR3Z4Y3 document the version of LÖVE I've been using
• [46] KKQKPGCI resolve conflicts
• [47] VHQCNMAR several more modules
• [48] 66X36NZN a little more prose describing manual_tests
• [49] MUDXM3JI clearing starty is redundant in mutations
• [50] N2NUGNN4 include a brief reference enabling many useful apps
• [51] 7YGYHOEO Merge lines.love
• [52] VP5KC4XZ Merge lines.love
• [53] CE4LZV4T drop last couple of manual tests
• [54] TVCPXAAU rename
• [55] FS2ITYYH record a known issue
• [56] SGMA5JLE save the list of tests in repo
• [57] 4YDBYBA4 clean up memory leak experiments
• [58] ORKN6EOB Merge lines.love
• [59] R5QXEHUI somebody stop me
• [60] 6VJTQKW7 start supporting LÖVE v12
• [61] WKXJNESI resolve conflicts
• [62] 3PSFWAIL Merge lines.love
• [63] GVJEOWYQ resolve conflicts
• [64] KKMFQDR4 editing source code from within the app
• [65] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [66] 2JBAEQHU Merge lines.love
• [67] 6D5MOJS4 allow buttons to interrupt events
• [68] MLG2OGU7 things seem to feel snappier now
• [69] ZLJYLPOT Merge lines.love
• [70] RSZD5A7G forgot to add json.lua
• [71] 3QNOKBFM beginnings of a test harness
• [72] T4FRZSYL delete an ancient, unused file
• [73] OGUV4HSA remove some memory leaks from rendered fragments
• [74] MD3W5IRA new fork: rip out drawing support
• [75] KMSL74GA support selections in the source editor
• [76] TFUNIT6M resolve conflicts
• [77] TBTRYEBP Merge lines.love
• [78] TOXPJJYY resolve conflicts
• [79] CRBLAWBO resolve conflicts
• [80] BULPIBEG beginnings of a module for the text editor
• [81] F4QQIBEH clarify what "large files" means
• [82] QMRQL2FO resolve conflicts
• [83] YXQOITYS Merge lines.love
• [84] WJBZZQE4 fold together two largely similar cases
• [85] 2CTN2IEF Merge lines.love
• [86] D2GCFTTT clean up repl functionality

Change contents

• file deletion: source_text.lua (----------)source_text.lua (----------)
  [6.2]→[6.147062:147101](∅→∅),[6.2]→[6.147062:147101](∅→∅),[6.147101]→[6.83723:83723](∅→∅)
  − Text.delete_selection_and_record_undo_event(State)

  − Text.delete_selection_and_record_undo_event(State)

  − schedule_save(State)

  − return

  − end

  − schedule_save(State)

  − return

  − end
• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [6.2]→[6.165725:165764](∅→∅),[6.2]→[6.165725:165764](∅→∅),[6.165764]→[6.152440:152440](∅→∅)
  − Drawing.before = nil

  − Text.delete_selection_and_record_undo_event(State)

  − local s = Text.cut_selection_and_record_undo_event(State)

  − if s then

  − end

  − schedule_save(State)
• replacement in source_text.lua at line 251
  [6.21274]→[6.21274:21334](∅→∅)
  − Text.delete_selection(State, State.left, State.right)
  [6.21274]

  [6.21334]
  + Text.delete_selection_and_record_undo_event(State)
• replacement in source_text.lua at line 299
  [6.21417]→[6.21417:21477](∅→∅)
  − Text.delete_selection(State, State.left, State.right)
  [6.21417]

  [6.21477]
  + Text.delete_selection_and_record_undo_event(State)
• edit in source_edit.lua at line 193
  [6.19609]

  [2.320]
  + Drawing.before = nil
• replacement in source_edit.lua at line 395
  [6.164]→[6.25793:25851](∅→∅),[6.179]→[6.25793:25851](∅→∅),[6.198]→[6.25793:25851](∅→∅),[6.8468]→[6.25793:25851](∅→∅),[6.25793]→[6.25793:25851](∅→∅)
  − Text.delete_selection(State, State.left, State.right)
  [6.8468]

  [6.25851]
  + Text.delete_selection_and_record_undo_event(State)
• replacement in source_edit.lua at line 473
  [6.162145]→[6.162145:162210](∅→∅)
  − local s = Text.cut_selection(State, State.left, State.right)
  [6.162038]

  [6.162210]
  + local s = Text.cut_selection_and_record_undo_event(State)
• replacement in edit.lua at line 267
  [6.5120]→[6.5956:6014](∅→∅),[6.5956]→[6.5956:6014](∅→∅)
  − Text.delete_selection(State, State.left, State.right)
  [6.5120]

  [6.6014]
  + Text.delete_selection_and_record_undo_event(State)
• replacement in edit.lua at line 344
  [6.9171]→[6.9171:9236](∅→∅)
  − local s = Text.cut_selection(State, State.left, State.right)
  [6.9064]

  [6.9236]
  + local s = Text.cut_selection_and_record_undo_event(State)
• edit in edit.lua at line 446
  [6.12430]→[2.538:538](∅→∅),[6.13432]→[4.782:844](∅→∅),[6.13432]→[4.782:844](∅→∅),[6.185]→[4.726:781](∅→∅),[6.185]→[4.726:781](∅→∅),[6.185]→[4.726:781](∅→∅),[6.935]→[3.45:89](∅→∅),[6.935]→[3.45:89](∅→∅),[6.935]→[3.45:89](∅→∅)
  −

  − local s = Text.cut_selection_and_record_undo_event(State)

  − Text.delete_selection_and_record_undo_event(State)

  − Drawing.before = nil
• resolve order conflict in edit.lua at line 446
  [6.12430]
• edit in README.md at line 49
  [6.95]→[6.12041:12110](∅→∅),[6.95]→[6.12041:12110](∅→∅)
  − other ways. Works well in all circumstances with files under 50KB.