comment out debug prints while fixing merge conflicts

akkartik

Jun 11, 2024, 7:34 PM

NWMQ6PVS3DU4RRDZ62JDOOVUALH3LRRLKBZNVK2VBC3EJUT34TVQC

Dependencies

• [2] CRBLAWBO resolve conflicts
• [3] HTWAM4NZ bugfix: scrolling in left/right movements
• [4] JJ7J4PUB some unnecessary mutations
• [5] QCPXQ2E3 add state arg to a few functions
• [6] MD3W5IRA new fork: rip out drawing support
• [7] LF7BWEG4 group all editor globals
• [8] G3DLS5OU audit all asserts
• [9] TOXPJJYY resolve conflicts
• [10] OI4FPFIN support drawings in the source editor
• [11] SVJZZDC3 snapshot - no, that's all wrong
• [12] Z5HLXU4P add state arg to a few functions
• [13] GNQC72UX generalize a function
• [14] KV7GGVER couple of accidental globals
• [15] KKQKPGCI resolve conflicts
• [16] GGJEDJOO add args to some functions
• [17] MUJTM6RE bring back a level of wrapping
• [18] MXA3RZYK deduce left/right from state where possible
• [19] CUIV2LE5 some typos
• [20] ZPUQSPQP extract a few methods
• [21] AQMZJXUR use editor state font for width calculations
• [22] ZS5IYZH5 stop caching screen_bottom1
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• replacement in text.lua at line 443
  [3.1280]→[2.97:199](∅→∅)
  − print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
  [3.1280]

  [3.1153]
  + --? print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
• replacement in text.lua at line 447
  [3.2960]→[2.200:253](∅→∅)
  − print('cursor at final screen line of its line')
  [3.2960]

  [3.5428]
  + --? print('cursor at final screen line of its line')
• replacement in text.lua at line 452
  [3.263]→[2.254:285](∅→∅)
  − print(State.cursor1.pos)
  [3.263]

  [3.265]
  + --? print(State.cursor1.pos)
• replacement in text.lua at line 455
  [3.2168]→[2.286:431](∅→∅)
  − print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
  [3.2168]

  [3.2317]
  + --? print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
• replacement in text.lua at line 457
  [3.2370]→[2.432:556](∅→∅)
  − print('screen top before:', State.screen_top1.line, State.screen_top1.pos)

  − print('scroll up preserving cursor')
  [3.2370]

  [3.1451]
  + --? print('screen top before:', State.screen_top1.line, State.screen_top1.pos)

  + --? print('scroll up preserving cursor')
• replacement in text.lua at line 460
  [3.1501]→[2.557:637](∅→∅)
  − print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
  [3.1501]

  [3.3680]
  + --? print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
• replacement in text.lua at line 466
  [3.2489]→[2.638:698](∅→∅)
  − print('cursor is NOT at final screen line of its line')
  [3.2489]

  [3.113]
  + --? print('cursor is NOT at final screen line of its line')
• replacement in text.lua at line 470
  [3.252]→[2.699:841](∅→∅)
  − print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))
  [3.252]

  [3.4545]
  + --? print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))
• replacement in text.lua at line 474
  [3.901]→[2.842:912](∅→∅)
  − print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
  [3.901]

  [3.130]
  + --? print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
• replacement in text.lua at line 476
  [3.154]→[2.913:956](∅→∅)
  − print('scroll up preserving cursor')
  [3.154]

  [3.1721]
  + --? print('scroll up preserving cursor')
• replacement in text.lua at line 478
  [3.1771]→[2.957:1037](∅→∅)
  − print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
  [3.1771]

  [3.4796]
  + --? print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
• replacement in text.lua at line 481
  [3.4810]→[2.1038:1138](∅→∅)
  − print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
  [3.4810]

  [3.6091]
  + --? print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)