resolve conflicts

akkartik

Feb 8, 2024, 10:44 AM

PHZX5H255BLSGXIKQ4EJE7A3NGSXUXUXPFI56Y7XNNQ6VBPTX2WAC

Dependencies

• [2] VESAKVTR Merge lines.love
• [3] J7A5ROM3 bugfix in cursor positioning
• [4] 27DROQW2 Merge upstream into main
• [5] OEUU62GM Merge upstream into main
• [6] IWYLK45K clicking to the right of a line within line width
• [7] EMHRPJ3R no, that's not right
• [8] ORRSP7FV deduce test names on failures
• [9] 2JLVAYHB start decoupling editor tests from App
• [10] 2H76FV5S bugfix: searching files containing unicode
• [11] AMOPICKV bugfix: check after cursor on same line when searching upwards
• [12] 7CEOB56D Merge upstream into main
• [13] LF7BWEG4 group all editor globals
• [14] M6TH7VSZ rip out notion of Line_width
• [15] PNGWLAFN Merge upstream into main
• [16] APYPFFS3 call edit rather than App callbacks in tests
• [*] LXTTOB33 extract a couple of files

Change contents

• resurrect zombie in text_tests.lua at line 578
  [4.246]→[4.1477:1547](∅→∅),[4.246]→[4.1477:1547](∅→∅)
  + edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
• replacement in text_tests.lua at line 579
  [4.301]→[4.803:843](∅→∅),[4.1547]→[4.803:843](∅→∅),[4.301]→[4.803:843](∅→∅),[4.803]→[4.803:843](∅→∅),[4.301]→[4.803:843](∅→∅),[4.1547]→[4.803:843](∅→∅),[4.803]→[4.803:843](∅→∅),[4.843]→[2.104:155](∅→∅),[4.843]→[2.104:155](∅→∅)
  − -- cursor moves to end of screen line

  − check_eq(Editor_state.cursor1.pos, 20, 'cursor')
  [4.1547]

  [4.4]
  + -- cursor moves to end of screen line (one more than final character shown)

  + check_eq(Editor_state.cursor1.pos, 21, 'cursor')
• edit in text_tests.lua at line 2182
  [4.756]→[2.157:157](∅→∅),[4.1547]→[3.270:399](∅→∅),[4.1547]→[3.270:399](∅→∅)
  −

  − -- cursor moves to end of screen line (one more than final character shown)

  − check_eq(Editor_state.cursor1.pos, 21, 'cursor')
• resolve order conflict in text_tests.lua at line 2182
  [4.756]