resolve conflicts

akkartik

Jun 16, 2024, 1:12 PM

5BGU7U3KD4H3HDHPJK5T3HG6MQ6QKXTDO3VKBFM6BR2Q2TZIPYGAC

Dependencies

• [2] MZ3DMYPD start sketching out a scrollbar
• [3] 2GVF47BI update a stale comment
• [4] PNHUONCT update documentation on fragments
• [5] ILOA5BYF separate data structure for each line's cache data
• [6] TGHAJBES use line cache for drawings as well
• [7] LF7BWEG4 group all editor globals
• [8] 2TCIWW6Z stop caching starty
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• resurrect zombie in edit.lua at line 30
  [4.8245]→[2.1663:1751](∅→∅),[4.8245]→[2.1663:1751](∅→∅)
  + -- start_screen_line_index: a count of the number of screen lines above this line
• edit in edit.lua at line 30
  [4.7961]

  [2.1663]
  + -- screen_line_starting_pos: optional array of codepoint indices if it wraps over more than one screen line
• edit in edit.lua at line 32
  [4.7961]→[3.29:143](∅→∅)
  − -- screen_line_starting_pos: optional array of codepoint indices if it wraps over more than one screen line
• resolve order conflict in edit.lua at line 32
  [2.1751]

  [4.1829]