resolve conflicts

akkartik

Jul 22, 2024, 9:25 PM

QZUFJMD5OTAZGSUO4HSJ2NNNRJR7NOKIVOIIGHWM6IF4PFNMQZHAC

Dependencies

• [2] 3VPHONXQ Merge lines.love
• [3] CQVWNL4M resolve conflicts
• [4] PATWQOHR register a new add-on tool
• [5] GX5PD3CL consistently schedule_save after all mutations
• [6] 3GITFJZK fix a comment
• [7] TVCPXAAU rename
• [8] BULPIBEG beginnings of a module for the text editor
• [9] YXQOITYS Merge lines.love
• [10] QMRQL2FO resolve conflicts
• [11] GVJEOWYQ resolve conflicts
• [12] JOPVPUSA editing source code from within the app
• [13] LXTTOB33 extract a couple of files
• [14] R2ASHK5C fix a bad merge
• [15] WJBZZQE4 fold together two largely similar cases
• [16] OTIBCAUJ love2d scaffold
• [17] ONHKBLLC Merge lines.love
• [18] 73OCE2MC after much struggle, a brute-force undo
• [19] TOXPJJYY resolve conflicts
• [20] RSZD5A7G forgot to add json.lua
• [21] 3QNOKBFM beginnings of a test harness
• [22] KKMFQDR4 editing source code from within the app
• [23] MBAJPTDJ resolve conflicts
• [24] TFUNIT6M resolve conflicts
• [25] AVTNUQYR basic test-enabled framework
• [26] 2L5MEZV3 experiment: new edit namespace
• [27] D2GCFTTT clean up repl functionality
• [28] 5SM6DRHK port inscript's bugfix to source editor
• [29] OI4FPFIN support drawings in the source editor
• [30] OGUV4HSA remove some memory leaks from rendered fragments
• [31] D4B52CQ2 Merge lines.love
• [32] T4FRZSYL delete an ancient, unused file
• [33] 3PSFWAIL Merge lines.love
• [34] 2CTN2IEF Merge lines.love
• [35] TBTRYEBP Merge lines.love
• [36] 4YDBYBA4 clean up memory leak experiments
• [37] MTJEVRJR add state arg to a few functions
• [38] MD3W5IRA new fork: rip out drawing support
• [39] VP5KC4XZ Merge lines.love
• [40] R5QXEHUI somebody stop me
• [41] VXORMHME delete experimental REPL
• [42] SGMA5JLE save the list of tests in repo
• [43] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [44] FPY4LO2W make a few names consistent with snake_case
• [45] KKQKPGCI resolve conflicts
• [46] 3XNFQDDN Merge lines.love
• [47] 6D5MOJS4 allow buttons to interrupt events
• [48] 34BZ5ZKN Merge lines.love
• [49] 7YGYHOEO Merge lines.love
• [50] SBS2F7GR link to export tool
• [51] VTCPDL3A resolve conflicts
• [52] RXMHAZ6V resolve conflicts
• [53] VHQCNMAR several more modules
• [54] LF7BWEG4 group all editor globals
• [55] PTDO2SOT add state arg to schedule_save
• [56] REAIVN7W Merge lines.love
• [57] ORKN6EOB Merge lines.love
• [58] 4SR3Z4Y3 document the version of LÖVE I've been using
• [59] ZLJYLPOT Merge lines.love
• [60] LWPFEZBI Merge lines.love
• [61] KMSL74GA support selections in the source editor
• [62] ED4Z6ORC cleaner API for file-system access
• [63] 5YJBJO37 mention a new tool
• [64] CE4LZV4T drop last couple of manual tests
• [65] 66X36NZN a little more prose describing manual_tests
• [66] WLJCIXYM add state arg to a few functions
• [67] UHB4GARJ left/right margin -> left/right coordinates
• [68] VHUNJHXB Merge lines.love
• [69] K2X6G75Z start writing some tests for drawings
• [70] N2NUGNN4 include a brief reference enabling many useful apps
• [71] 6LJZN727 handle chords
• [72] BLWAYPKV extract a module
• [73] LNUHQOGH start passing in Editor_state explicitly
• [74] XX7G2FFJ intermingle freehand line drawings with text
• [75] K6DTOGOQ flip return value of button handlers
• [76] D4FEFHQC flesh out Readme
• [77] 6VJTQKW7 start supporting LÖVE v12
• [78] CRBLAWBO resolve conflicts
• [79] TYLURRX3 resolve conflicts
• [80] ZS5IYZH5 stop caching screen_bottom1
• [81] FS2ITYYH record a known issue
• [82] HWTLXESC Merge lines.love
• [83] GIG6OV3G port keyboard layout handling to source editor
• [84] MGJZHZC4 Merge lines.love
• [85] TLOAPLBJ add a license
• [86] WKXJNESI resolve conflicts

Change contents

• file deletion: source_text.lua (----------)source_text.lua (----------)
  [7.2]→[7.147062:147101](∅→∅),[7.2]→[7.147062:147101](∅→∅),[7.147101]→[7.83723:83723](∅→∅)
  − -- The modifiers didn't change the key. Handle it in keychord_press.

  − schedule_save(State)

  − schedule_save(State)

  − schedule_save(State)

  − schedule_save(State)

  − --== shortcuts that move the cursor

  − elseif chord == 'left' then

  − Text.left(State)

  − elseif chord == 'delete' then

  − elseif chord == 'backspace' then

  − elseif chord == 'tab' then

  − local before = snapshot(State, State.cursor1.line)

  − return

  − else

  − -- Key mutated by the keyboard layout. Continue below.

  − end

  − end
• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [7.2]→[7.165725:165764](∅→∅),[7.2]→[7.165725:165764](∅→∅),[7.165764]→[7.152440:152440](∅→∅)
  − schedule_save(State)

  − schedule_save(State)

  − record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

  − schedule_save(State)

  − else

  − end,

  − })
• replacement in source_text.lua at line 201
  [7.70]→[7.70:147](∅→∅)
  − -- The modifiers didn't change the key. Handle it in keychord_pressed.
  [7.70]

  [7.147]
  + -- The modifiers didn't change the key. Handle it in keychord_press.
• edit in source_text.lua at line 233
  [7.99055]→[7.21213:21239](∅→∅)
  − State.selection1 = {}
• edit in source_text.lua at line 236
  [7.99205]→[7.99205:99230](∅→∅)
  − schedule_save(State)
• edit in source_text.lua at line 237
  [7.99332]

  [7.99332]
  + schedule_save(State)
• edit in source_text.lua at line 247
  [7.99991]

  [7.99991]
  + record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
• edit in source_text.lua at line 249
  [7.100016]→[7.100016:100105](∅→∅)
  − record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
• edit in source_text.lua at line 295
  [7.1088]

  [7.102974]
  + record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
• edit in source_text.lua at line 297
  [7.102999]→[7.102999:103088](∅→∅)
  − record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
• edit in source_text.lua at line 329
  [7.105404]→[7.105404:105429](∅→∅)
  − schedule_save(State)
• edit in source_text.lua at line 330
  [7.105518]

  [7.105518]
  + schedule_save(State)
• edit in source_edit.lua at line 192
  [7.19441]→[7.19441:19485](∅→∅)
  − schedule_save(State)
• edit in source_edit.lua at line 193
  [7.19609]

  [7.19609]
  + schedule_save(State)
• edit in source_edit.lua at line 302
  [7.5857]→[7.20988:21013](∅→∅),[7.20988]→[7.20988:21013](∅→∅)
  − schedule_save(State)
• edit in source_edit.lua at line 306
  [7.21189]

  [7.24400]
  + schedule_save(State)
• edit in source_edit.lua at line 494
  [7.163035]

  [7.163035]
  + record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
• edit in source_edit.lua at line 496
  [7.163060]→[7.163060:163162](∅→∅)
  − record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
• edit in edit.lua at line 368
  [7.10055]→[7.10055:10080](∅→∅)
  − schedule_save(State)
• replacement in edit.lua at line 369
  [7.10182]→[7.10182:10204](∅→∅)
  − -- dispatch to text
  [7.10182]

  [7.10204]
  + schedule_save(State)
• edit in edit.lua at line 448
  [7.12430]→[3.157:157](∅→∅),[7.14368]→[5.679:781](∅→∅),[7.14368]→[5.679:781](∅→∅),[7.8797]→[5.653:678](∅→∅),[7.8797]→[5.653:678](∅→∅),[7.935]→[5.608:652](∅→∅),[7.935]→[5.608:652](∅→∅)
  −

  − record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

  − schedule_save(State)

  − schedule_save(State)
• resolve order conflict in edit.lua at line 448
  [7.12430]
• edit in README.md at line 78
  [7.12675]→[2.35:35](∅→∅),[7.131]→[4.0:179](∅→∅),[7.131]→[4.0:179](∅→∅)
  −

  − * https://codeberg.org/eril/lines2html.love provides the option to export

  − just the drawings to a directory. Also provides a CLI, which should be more

  − natural for many people.
• resolve order conflict in README.md at line 78
  [7.12675]

  [7.145]