resolve conflicts

akkartik

Feb 5, 2024, 1:46 AM

EWWIFR6PRJFDRO2D2DES5GEPQO5RZZECRHNCUJE45KO27VK6Q4FQC

Dependencies

• [2] GZ2OYPSH configurable colors and cursor in editor widget
• [3] FHNPQBLK more carefully pass the 'key' arg around
• [4] APYPFFS3 call edit rather than App callbacks in tests
• [5] NUZFHX6I flesh out some tests for word movements
• [6] LF7BWEG4 group all editor globals
• [7] HPVT467W initialize contains test state
• [8] LNUHQOGH start passing in Editor_state explicitly
• [9] 2LC3BM2N support other whitespace chars in word movements
• [10] ILOA5BYF separate data structure for each line's cache data
• [11] ORRSP7FV deduce test names on failures
• [12] V3EABA35 skip multiple consecutive whitespace
• [*] LXTTOB33 extract a couple of files

Change contents

• resurrect zombie in text_tests.lua at line 62
  [4.2805]→[2.80:118](∅→∅),[4.2805]→[2.80:118](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 63
  [4.150]→[3.189:245](∅→∅),[4.150]→[3.189:245](∅→∅)
  + edit.run_after_keychord(Editor_state, 'left', 'left')
• resolve order conflict in text_tests.lua at line 63
  [2.118]

  [3.189]
• resurrect zombie in text_tests.lua at line 73
  [4.3035]→[2.119:157](∅→∅),[4.3035]→[2.119:157](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 74
  [4.177]→[3.246:304](∅→∅),[4.177]→[3.246:304](∅→∅)
  + edit.run_after_keychord(Editor_state, 'right', 'right')
• resolve order conflict in text_tests.lua at line 74
  [2.157]

  [3.246]
• resurrect zombie in text_tests.lua at line 84
  [4.3275]→[2.158:196](∅→∅),[4.3275]→[2.158:196](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 85
  [4.204]→[3.305:361](∅→∅),[4.204]→[3.305:361](∅→∅)
  + edit.run_after_keychord(Editor_state, 'left', 'left')
• resolve order conflict in text_tests.lua at line 85
  [2.196]

  [3.305]
• resurrect zombie in text_tests.lua at line 96
  [4.3662]→[2.197:235](∅→∅),[4.3662]→[2.197:235](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 97
  [4.231]→[3.362:420](∅→∅),[4.231]→[3.362:420](∅→∅)
  + edit.run_after_keychord(Editor_state, 'right', 'right')
• resolve order conflict in text_tests.lua at line 97
  [2.235]

  [3.362]
• resurrect zombie in text_tests.lua at line 108
  [4.3994]→[2.236:274](∅→∅),[4.3994]→[2.236:274](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 109
  [4.258]→[3.421:479](∅→∅),[4.258]→[3.421:479](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-left', 'left')
• resolve order conflict in text_tests.lua at line 109
  [2.274]

  [3.421]
• resurrect zombie in text_tests.lua at line 119
  [4.4273]→[2.275:313](∅→∅),[4.4273]→[2.275:313](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 120
  [4.285]→[3.480:538](∅→∅),[4.285]→[3.480:538](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-left', 'left')
• resolve order conflict in text_tests.lua at line 120
  [2.313]

  [3.480]
• resurrect zombie in text_tests.lua at line 130
  [4.4562]→[2.314:352](∅→∅),[4.4562]→[2.314:352](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 131
  [4.312]→[3.539:597](∅→∅),[4.312]→[3.539:597](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-left', 'left')
• resolve order conflict in text_tests.lua at line 131
  [2.352]

  [3.539]
• resurrect zombie in text_tests.lua at line 141
  [4.4838]→[2.353:391](∅→∅),[4.4838]→[2.353:391](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 142
  [4.339]→[3.598:656](∅→∅),[4.339]→[3.598:656](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-left', 'left')
• resolve order conflict in text_tests.lua at line 142
  [2.391]

  [3.598]
• resurrect zombie in text_tests.lua at line 152
  [4.5128]→[2.392:430](∅→∅),[4.5128]→[2.392:430](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 153
  [4.366]→[3.657:715](∅→∅),[4.366]→[3.657:715](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-left', 'left')
• resolve order conflict in text_tests.lua at line 153
  [2.430]

  [3.657]
• resurrect zombie in text_tests.lua at line 163
  [4.5399]→[2.431:469](∅→∅),[4.5399]→[2.431:469](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 164
  [4.393]→[3.716:774](∅→∅),[4.393]→[3.716:774](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-left', 'left')
• resolve order conflict in text_tests.lua at line 164
  [2.469]

  [3.716]
• resurrect zombie in text_tests.lua at line 175
  [4.5765]→[2.470:508](∅→∅),[4.5765]→[2.470:508](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 176
  [4.420]→[3.775:835](∅→∅),[4.420]→[3.775:835](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-right', 'right')
• resolve order conflict in text_tests.lua at line 176
  [2.508]

  [3.775]
• resurrect zombie in text_tests.lua at line 186
  [4.6044]→[2.509:547](∅→∅),[4.6044]→[2.509:547](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 187
  [4.447]→[3.836:896](∅→∅),[4.447]→[3.836:896](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-right', 'right')
• resolve order conflict in text_tests.lua at line 187
  [2.547]

  [3.836]
• resurrect zombie in text_tests.lua at line 197
  [4.6320]→[2.548:586](∅→∅),[4.6320]→[2.548:586](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 198
  [4.474]→[3.897:957](∅→∅),[4.474]→[3.897:957](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-right', 'right')
• resolve order conflict in text_tests.lua at line 198
  [2.586]

  [3.897]
• resurrect zombie in text_tests.lua at line 208
  [4.6606]→[2.587:625](∅→∅),[4.6606]→[2.587:625](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 209
  [4.501]→[3.958:1018](∅→∅),[4.501]→[3.958:1018](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-right', 'right')
• resolve order conflict in text_tests.lua at line 209
  [2.625]

  [3.958]
• resurrect zombie in text_tests.lua at line 219
  [4.6873]→[2.626:664](∅→∅),[4.6873]→[2.626:664](∅→∅)
  + edit.draw(Editor_state, Text_color)
• resurrect zombie in text_tests.lua at line 220
  [4.528]→[3.1019:1079](∅→∅),[4.528]→[3.1019:1079](∅→∅)
  + edit.run_after_keychord(Editor_state, 'M-right', 'right')
• resolve order conflict in text_tests.lua at line 220
  [2.664]

  [3.1019]