resolve conflicts

akkartik

Nov 18, 2023, 7:54 PM

APOMBXMUSQMQPV2ERSMI4Y3T53PS2JB7P5OTK5GDGATCTBCAUWRAC

Dependencies

• [2] KNWMKLNJ Merge lines.love
• [3] G3DLS5OU audit all asserts
• [4] 57OGXVHZ Merge lines.love
• [5] LDFXFRUO bring a few things in sync between run and source
• [6] NPXYCSEA Merge lines.love
• [7] 5BMR5HRT click to the left of a line
• [8] CIK3U5S6 Merge lines.love
• [9] ELJNEPW2 simplify cursor-on-screen check
• [10] LNUHQOGH start passing in Editor_state explicitly
• [11] TGZAJUEF bring back a set of constants
• [12] OWE64YJ2 Merge lines.love
• [13] WJBZZQE4 fold together two largely similar cases
• [14] Z5WOBP27 Merge lines.love
• [15] 2L5MEZV3 experiment: new edit namespace
• [16] LF7BWEG4 group all editor globals
• [17] KKMFQDR4 editing source code from within the app
• [18] T4C5HT2O support a commandline arg just like in pensieve.love
• [19] 2SAJWSNK automatically insert timestamp every time
• [20] 5CDHNEKR Merge lines.love
• [21] KTZQ57HV replace globals with args in a few functions
• [22] 4KC7I3E2 make colors easier to edit
• [23] HHYXYWAF bugfix: write to file 'recent'
• [24] PP2IIHL6 stop putting button state in a global
• [25] VN3MTXFK Merge lines.love
• [26] FTB4YNQU Merge lines.love

Change contents

• replacement in run.lua at line 38
  [4.254]→[4.254:303](∅→∅)
  − assert(not file_exists(Editor_state.filename))
  [4.254]

  [4.114]
  + assert(not file_exists(Editor_state.filename), 'refusing to overwrite existing file at current timestamp')
• replacement in edit.lua at line 162
  [4.533]→[4.533:884](∅→∅)
  − if #State.lines ~= #State.line_cache then

  − print(('line_cache is out of date; %d when it should be %d'):format(#State.line_cache, #State.lines))

  − assert(false)

  − end

  − if not Text.le1(State.screen_top1, State.cursor1) then

  − print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

  − assert(false)

  − end
  [4.533]

  [4.884]
  + 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))
• replacement in edit.lua at line 203
  [4.2646]→[4.2646:2689](∅→∅)
  − print(line.mode)

  − assert(false)
  [4.2646]

  [4.2689]
  + assert(false, ('unknown line mode %s'):format(line.mode))
• edit in edit.lua at line 622
  [4.17561]→[2.126:126](∅→∅),[4.5492]→[3.7493:7557](∅→∅),[4.5492]→[3.7493:7557](∅→∅),[4.1023]→[3.7131:7492](∅→∅),[4.1023]→[3.7131:7492](∅→∅)
  −

  − assert(false, ('unknown line mode %s'):format(line.mode))

  − 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 622
  [4.17561]