resolve conflicts

akkartik

Nov 18, 2023, 8:53 PM

O2E2MUT2SBJ3RYHEEYUZ524UPK2CDQQCW64BQNMXNTE5RWQGLH5AC

Dependencies

• [2] 52NEZG2F Merge text0
• [3] OV6FE23R Merge text0
• [4] KKQKPGCI resolve conflicts
• [5] R2ASHK5C fix a bad merge
• [6] LSYLEVBD drop some redundant args when clearing the cache
• [7] ILOA5BYF separate data structure for each line's cache data
• [8] TGHAJBES use line cache for drawings as well
• [9] 2N3HLCOV Merge text0
• [10] 4CTZOJPC stop pretending globals are local
• [11] PLKNHYZ4 extract a function
• [12] CYEH4AXB a prefix for metadata in the manifest
• [13] B4FAIVRA Merge lines.love
• [14] NQM25OZV reduce use of rfind
• [15] 3XNFQDDN Merge lines.love
• [16] 6K5PFF6X helper: trimming whitespace from strings
• [*] BULPIBEG beginnings of a module for the text editor
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in text.lua at line 963
  [5.442]→[2.995:995](∅→∅),[5.442]→[4.167:167](∅→∅)
  −

  −
• resurrect zombie in edit.lua at line 106
  [5.58]→[3.15:58](∅→∅),[5.58]→[3.15:58](∅→∅)
  + function edit.draw(State, fg, hide_cursor)
• resurrect zombie in edit.lua at line 107
  [5.108]→[4.8403:8764](∅→∅),[5.108]→[4.8403:8764](∅→∅)
  + assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))

  + assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))
• resolve order conflict in edit.lua at line 107
  [3.58]

  [4.8403]