resolve conflicts

akkartik

Jul 10, 2024, 5:05 AM

TWSPUEHFY7BNYW5VKGERLFMSWDLEM4P6MPPJG37MDDIR32GKP2JAC

Dependencies

• [2] 235D5R3Z resolve conflicts
• [3] 7ZXZGVHM purge obsolete term 'fragment'
• [4] APOMBXMU resolve conflicts
• [5] WLWNS6FB a bug I've never run into
• [6] VYIA2JFX resolve conflicts
• [7] XQV3PNH2 resolve conflicts
• [8] VOJISLDC resolve conflicts
• [9] QCPXQ2E3 add state arg to a few functions
• [10] KNWMKLNJ Merge lines.love
• [11] OO5GDU53 pijul bug: why did previous change not have any effect?
• [12] 54HQZ536 resolve conflicts
• [13] CIK3U5S6 Merge lines.love
• [14] LNUHQOGH start passing in Editor_state explicitly
• [15] ILOA5BYF separate data structure for each line's cache data
• [16] TGHAJBES use line cache for drawings as well
• [17] OWE64YJ2 Merge lines.love
• [18] Z5WOBP27 Merge lines.love
• [19] 2L5MEZV3 experiment: new edit namespace
• [20] P4NJ2KS7 resolve conflicts
• [21] KF72R2XX resolve conflicts
• [22] PTDO2SOT add state arg to schedule_save
• [23] 5CDHNEKR Merge lines.love

Change contents

• replacement in edit.lua at line 400
  [4.9726]→[4.9726:9823](∅→∅)
  − Text.redraw_all(State) -- if we're scrolling, reclaim all fragments to avoid memory leaks
  [4.9726]

  [4.9823]
  + Text.redraw_all(State) -- if we're scrolling, reclaim all line caches to avoid memory leaks
• edit in edit.lua at line 445
  [4.11364]→[4.11364:11434](∅→∅)
  − patch_placeholders(State.line_cache, event.after, event.before)
• replacement in edit.lua at line 447
  [4.11523]→[4.11523:11625](∅→∅)
  − -- if we're scrolling, reclaim all fragments to avoid memory leaks

  − Text.redraw_all(State)
  [4.11523]

  [4.11625]
  + Text.redraw_all(State) -- if we're scrolling, reclaim all line caches to avoid memory leaks
• replacement in edit.lua at line 460
  [4.12164]→[4.12164:12266](∅→∅)
  − -- if we're scrolling, reclaim all fragments to avoid memory leaks

  − Text.redraw_all(State)
  [4.12164]

  [4.12266]
  + Text.redraw_all(State) -- if we're scrolling, reclaim all line caches to avoid memory leaks
• edit in edit.lua at line 612
  [4.17561]→[2.285:285](∅→∅),[4.296]→[3.1915:2014](∅→∅),[4.296]→[3.1915:2014](∅→∅),[4.104]→[3.1815:1914](∅→∅),[4.104]→[3.1815:1914](∅→∅),[4.7184]→[3.1715:1814](∅→∅),[4.7184]→[3.1715:1814](∅→∅)
  −

  − Text.redraw_all(State) -- if we're scrolling, reclaim all line caches to avoid memory leaks

  − Text.redraw_all(State) -- if we're scrolling, reclaim all line caches to avoid memory leaks

  − Text.redraw_all(State) -- if we're scrolling, reclaim all line caches to avoid memory leaks
• resolve order conflict in edit.lua at line 612
  [4.17561]