resolve conflicts

akkartik

Nov 18, 2023, 8:59 PM

DALNQKAVQB53LC7MLAEYEPZNHJDAGEXFBDZUMORKGKE5CUDGY3WQC

Dependencies

• [2] G4TDWMNZ no, make the scrollbar easier to acquire
• [3] KKQKPGCI resolve conflicts
• [4] XNFTJHC4 split keyboard handling between Text and Drawing
• [5] PTDO2SOT add state arg to schedule_save
• [6] QCPXQ2E3 add state arg to a few functions
• [7] LSYLEVBD drop some redundant args when clearing the cache
• [8] MD3W5IRA new fork: rip out drawing support
• [9] ZM7NOBRM new fork: carousel shell
• [10] PX7DDEMO autosave slightly less aggressively
• [11] LF7BWEG4 group all editor globals
• [12] PR4KIAZD first stab at equally hacky cursor down support
• [13] SPSW74Y5 add state arg to Text.keychord_pressed
• [14] I64IPGJX avoid saving fragments in lines
• [15] UHB4GARJ left/right margin -> left/right coordinates
• [16] ICS45BIL editor widget now takes a bottom margin
• [17] G3DLS5OU audit all asserts
• [18] R2ASHK5C fix a bad merge
• [19] XUGDTYW2 stop confusingly reading a global
• [20] V5SYDHPQ start thinking of compute_fragments as a detail
• [21] OV6FE23R Merge text0
• [22] N6JEX2X6 remove an assertion
• [23] ILOA5BYF separate data structure for each line's cache data
• [24] MDXGMZU2 disable all debug prints
• [25] 2RXZ3PGO beginning of a new approach to scroll+wrap
• [26] MXSAHZN4 Merge lines.love
• [27] MXA3RZYK deduce left/right from state where possible
• [28] AYE2VEGJ extract a couple of methods
• [29] MZ3DMYPD start sketching out a scrollbar
• [30] HMODUNJE scroll on backspace
• [31] OGUV4HSA remove some memory leaks from rendered fragments
• [32] 7LVK4KRD fix a failing test
• [*] BULPIBEG beginnings of a module for the text editor
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• resurrect zombie in text.lua at line 19
  [4.63]→[4.3583:3747](∅→∅),[4.63]→[4.3583:3747](∅→∅)
  + App.color(Line_number_color)

  + love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)

  + if fg == nil then

  + initialize_color()

  + end
• resolve order conflict in text.lua at line 24
  [4.3747]

  [4.532]
• resurrect zombie in text.lua at line 239
  [4.3000]→[4.81:143](∅→∅),[4.3000]→[4.81:143](∅→∅)
  + Text.refresh_screen_line_cache(State, State.cursor1.line)
• resurrect zombie in text.lua at line 240
  [4.122]→[4.702:916](∅→∅),[4.122]→[4.702:916](∅→∅)
  + 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 text.lua at line 240
  [4.143]

  [4.702]
• resurrect zombie in text.lua at line 627
  [4.2683]→[4.266:321](∅→∅),[4.2683]→[4.266:321](∅→∅)
  + if State.top > State.bottom - State.line_height then
• edit in text.lua at line 628
  [4.321]→[4.4:4](∅→∅),[4.6899]→[4.4:4](∅→∅),[4.6899]→[3.163:163](∅→∅),[4.6899]→[3.163:163](∅→∅)
  −

  −
• resolve order conflict in text.lua at line 628
  [4.321]

  [4.1554]
• edit in edit.lua at line 111
  [4.339]→[2.0:114](∅→∅),[4.339]→[2.0:114](∅→∅)
  − print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

  − assert(false)