resolve conflicts

akkartik

Jan 22, 2024, 4:23 PM

EBRL7VKRBTW7VNIADHVR7UNP5L24S74TTWRWYKNT2OH4K4ZRAIOQC

Dependencies

• [2] FYTXKCO3 delete an unused arg
• [3] TUTDZZOO resolve conflicts
• [4] KJLZCK2R resolve conflicts
• [5] 4KC7I3E2 make colors easier to edit
• [6] HLIF3YQE Merge text0
• [7] X3F7ECSL add state arg to some functions
• [8] Z4XRNDTR find text
• [9] M7UODV5H Merge text0
• [10] CZQ3NJ4N Merge text0
• [11] ORRSP7FV deduce test names on failures
• [12] LXTTOB33 extract a couple of files
• [13] F2P336NO resolve conflicts
• [14] ULKNZUZK resolve conflicts
• [15] IM7UEBMK bugfix: highlight search patterns on the right line
• [16] ZM6AON3A resolve conflicts
• [17] XSKVRP2S resolve conflicts
• [18] ZLJGZYQG select text with shift + mouseclick
• [19] BE3WIEVK update cursor in search box
• [20] E3PF2R6Q stray dead code
• [21] VUAAYL6X handlers for _all_ LÖVE events
• [22] SDEY7LFJ rename a variable
• [23] TWXPV2AC hoist and duplicate a conditional
• [24] ZC7UBMKI pijul bug
• [25] CLNTRHOK resolve conflicts
• [26] JFFUF5AL override mouse state lookups in tests
• [27] G2SVT3RO Merge text0
• [28] MX7YD2WC resolve conflicts
• [29] AD34IX2Z couple more tests
• [30] Y5XAFGMW Merge text.love
• [31] VPRGENLA hide some details within the 'warning' state
• [32] 5GHT3LUX copy correct warning message
• [33] BMGHJX7G bugfix: search highlight straddling screen lines
• [34] AVTNUQYR basic test-enabled framework
• [35] LXFHXL2N Merge text.love
• [36] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [37] 52NEZG2F Merge text0
• [38] AQMZJXUR use editor state font for width calculations
• [39] JNJ4R56X support running tests multiple times
• [40] ISOFHXB2 App.width can no longer take a Text
• [41] JF5L2BBS test harness now supports copy/paste
• [*] BULPIBEG beginnings of a module for the text editor
• [*] OTIBCAUJ love2d scaffold
• [*] 3QNOKBFM beginnings of a test harness

Change contents

• replacement in text.lua at line 49
  [5.145]→[5.145:251](∅→∅)
  − Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
  [5.145]

  [5.251]
  + Text.pretend_draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
• replacement in text.lua at line 51
  [5.268]→[2.4:116](∅→∅)
  − Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color)
  [5.268]

  [5.384]
  + Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y, Cursor_color)
• replacement in text.lua at line 58
  [5.738]→[5.738:844](∅→∅)
  − Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
  [5.738]

  [5.844]
  + Text.pretend_draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
• replacement in text.lua at line 60
  [5.861]→[2.117:229](∅→∅)
  − Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color)
  [5.861]

  [5.977]
  + Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y, Cursor_color)
• edit in text.lua at line 62
  [5.169]→[5.4:112](∅→∅),[5.169]→[5.4:112](∅→∅),[5.571]→[5.113:221](∅→∅),[5.571]→[5.113:221](∅→∅)
  − Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

  − Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
• resolve order conflict in text.lua at line 62
  [5.993]

  [5.530]
• replacement in search.lua at line 16
  [5.1671]→[2.287:364](∅→∅),[5.1671]→[5.4596:4669](∅→∅)
  − Text.draw_cursor(State, 25+App.width(State.search_term),y-5, Cursor_color)

  − Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5)
  [5.1671]

  [5.49698]
  + Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5, Cursor_color)
• edit in main.lua at line 271
  [5.243]→[5.243:247](∅→∅),[5.247]→[3.13:13](∅→∅),[5.247]→[3.13:13](∅→∅),[3.13]→[5.55:151](∅→∅),[5.1581]→[5.55:151](∅→∅),[5.1581]→[5.55:151](∅→∅),[5.336]→[4.12:12](∅→∅),[5.336]→[4.12:12](∅→∅)
  − end

  −

  −

  − function warning_message()

  − assert(type(Current_app) == 'table')

  − return Current_app.message

  −
• resurrect zombie in main.lua at line 271
  [4.12]→[5.151:155](∅→∅),[5.151]→[5.151:155](∅→∅),[5.151]→[5.151:155](∅→∅)
  + end
• resolve order conflict in main.lua at line 271
  [5.243]

  [5.151]
• edit in app.lua at line 552
  [5.8166]→[4.20:20](∅→∅),[5.8166]→[4.20:20](∅→∅)
  −