akkartik/sokoban.love - Change MPLM5UH7A4SBA5O7KM42GSRKVG7MZ6H6CETAXMTDIZP4PJFLIYIAC

resolve conflicts

Created by akkartik on June 11, 2024

MPLM5UH7A4SBA5O7KM42GSRKVG7MZ6H6CETAXMTDIZP4PJFLIYIAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text_tests.lua at line 231 [9.2]
B:B[7.7400] → [8.4:35]
BD:B[7.7400] → [8.4:35]
```
  Editor_state.selection1 = {}
```

Replacement in text_tests.lua at line 232 [9.2]

B:BD[8.35] → [8.35:142]

BD:BD[8.35] → [8.35:142]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.starty for each line Editor_state.line_cache

[8.35]

[8.142]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.startpos for each line

Resurrecting zombie bytes in text_tests.lua at line 321 [9.2]
B:B[7.8381] → [11.821:859]
BD:B[7.8381] → [11.821:859]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 337 [9.2]
B:B[7.8755] → [11.860:898]
BD:B[7.8755] → [11.860:898]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 353 [9.2]
B:B[7.9128] → [11.899:937]
BD:B[7.9128] → [11.899:937]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 405 [9.2]
B:B[7.9503] → [11.1016:1054]
BD:B[7.9503] → [11.1016:1054]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 422 [9.2]
B:B[7.9917] → [11.1055:1093]
BD:B[7.9917] → [11.1055:1093]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 440 [9.2]
B:B[7.10286] → [11.1094:1132]
BD:B[7.10286] → [11.1094:1132]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 462 [9.2]
B:B[7.10831] → [11.1133:1171]
BD:B[7.10831] → [11.1133:1171]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 482 [9.2]
B:B[7.11418] → [11.1172:1210]
BD:B[7.11418] → [11.1172:1210]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 505 [9.2]
B:B[7.12004] → [11.1211:1249]
BD:B[7.12004] → [11.1211:1249]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 529 [9.2]
B:B[7.12594] → [11.1250:1288]
BD:B[7.12594] → [11.1250:1288]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 547 [9.2]
B:B[7.13018] → [11.1289:1327]
BD:B[7.13018] → [11.1289:1327]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 569 [9.2]
B:B[7.13628] → [11.1328:1366]
BD:B[7.13628] → [11.1328:1366]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 586 [9.2]
B:B[7.14133] → [11.1367:1405]
BD:B[7.14133] → [11.1367:1405]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 602 [9.2]
B:B[7.14508] → [11.1406:1444]
BD:B[7.14508] → [11.1406:1444]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 623 [9.2]
B:B[7.14995] → [11.1445:1483]
BD:B[7.14995] → [11.1445:1483]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 640 [9.2]
B:B[7.15369] → [11.1484:1522]
BD:B[7.15369] → [11.1484:1522]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 657 [9.2]
B:B[7.15736] → [11.1523:1561]
BD:B[7.15736] → [11.1523:1561]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 675 [9.2]
B:B[7.16093] → [11.1562:1600]
BD:B[7.16093] → [11.1562:1600]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 698 [9.2]
B:B[7.16691] → [11.1601:1639]
BD:B[7.16691] → [11.1601:1639]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 716 [9.2]
B:B[7.17134] → [11.1640:1678]
BD:B[7.17134] → [11.1640:1678]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 760 [9.2]
B:B[7.18618] → [11.1679:1717]
BD:B[7.18618] → [11.1679:1717]
```
  edit.draw(Editor_state, Text_color)
```

Replacement in text_tests.lua at line 789 [9.2]

B:BD[7.20197] → [11.1826:1933]

B:BD[7.20197] → [5.76:149]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

[7.20197]

[13.2]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.startpos for each line

Replacement in text_tests.lua at line 808 [9.2]

B:BD[14.497] → [15.2:109]

B:BD[14.497] → [16.196:269]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

[14.497]

[14.592]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.startpos for each line

Replacement in text_tests.lua at line 820 [9.2]

B:BD[17.215] → [17.215:390]

B:BD[17.425] → [17.425:467]

B:BD[17.467] → [4.2:40]

∅:D[18.26] → [17.467:761]

∅:D[4.40] → [17.467:761]

B:BD[17.467] → [17.467:761]

  Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=2, pos=5}
  Editor_state.screen_top1 = {line=2, pos=3}
  -- press mouse above first line of text
  edit.draw(Editor_state, Text_color)
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  -- selection is at screen top
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 2, 'selection:line')
  check_eq(Editor_state.selection1.pos, 3, 'selection:pos')

[17.215]

[17.761]

Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=2, pos=5}
Editor_state.screen_top1 = {line=2, pos=3}
-- press mouse above first line of text
edit.draw(Editor_state, Text_color)
edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
-- selection is at screen top
check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
check_eq(Editor_state.selection1.line, 2, 'selection:line')
check_eq(Editor_state.selection1.pos, 3, 'selection:pos')

Deletion in text_tests.lua at line 834 [9.2]

B:BD[19.62] → [19.62:685]

  -- I'd like to test what happens when a mouse click is below some page of
  -- text, potentially even in the middle of a line.
  -- However, it's brittle to set up a text line boundary just right.
  -- So I'm going to just check things below the bottom of the final line of
  -- text when it's in the middle of the screen.
  -- final screen line ends in the middle of screen
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abcde'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}

Resurrecting zombie bytes in text_tests.lua at line 834 [9.2]
B:B[19.720] → [15.110:148]
BD:B[19.720] → [15.110:148]
```
  edit.draw(Editor_state, Text_color)
```

Insertion in text_tests.lua at line 834 [9.2]

[19.62]

[15.110]

-- I'd like to test what happens when a mouse click is below some page of
-- text, potentially even in the middle of a line.
-- However, it's brittle to set up a text line boundary just right.
-- So I'm going to just check things below the bottom of the final line of
-- text when it's in the middle of the screen.
-- final screen line ends in the middle of screen
App.screen.init{width=50, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abcde'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=1}
Editor_state.screen_top1 = {line=1, pos=1}

Replacement in text_tests.lua at line 867 [9.2]

B:BD[7.21125] → [11.1934:2041]

B:BD[7.21125] → [16.270:343]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

[7.21125]

[20.581]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.startpos for each line

Replacement in text_tests.lua at line 891 [9.2]

B:BD[7.22267] → [11.2042:2149]

B:BD[7.22267] → [16.344:417]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.starty for each line Editor_state.line_cache
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

[7.22267]

[21.446]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.startpos for each line

Resurrecting zombie bytes in text_tests.lua at line 919 [9.2]
B:B[22.357] → [15.149:187]
BD:B[22.357] → [15.149:187]
```
  edit.draw(Editor_state, Text_color)
```
Deletion in text_tests.lua at line 969 [9.2]
B:BD[7.25425] → [11.2228:2266]
BD:BD[7.25425] → [11.2228:2266]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 979 [9.2]
B:B[7.26449] → [11.2267:2305]
BD:B[7.26449] → [11.2267:2305]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1013 [9.2]
B:B[23.443] → [11.2306:2344]
BD:B[23.443] → [11.2306:2344]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1056 [9.2]
B:B[7.27840] → [11.2384:2422]
BD:B[7.27840] → [11.2384:2422]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1083 [9.2]
B:B[7.28590] → [11.2423:2461]
BD:B[7.28590] → [11.2423:2461]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1111 [9.2]
B:B[7.29464] → [11.2462:2500]
BD:B[7.29464] → [11.2462:2500]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1138 [9.2]
B:B[7.30422] → [11.2501:2539]
BD:B[7.30422] → [11.2501:2539]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1171 [9.2]
B:B[7.31681] → [11.2540:2578]
BD:B[7.31681] → [11.2540:2578]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1199 [9.2]
B:B[7.32336] → [11.2579:2617]
BD:B[7.32336] → [11.2579:2617]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1226 [9.2]
B:B[7.33078] → [11.2618:2656]
BD:B[7.33078] → [11.2618:2656]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1253 [9.2]
B:B[7.34012] → [11.2657:2695]
BD:B[7.34012] → [11.2657:2695]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1282 [9.2]
B:B[7.34926] → [11.2696:2734]
BD:B[7.34926] → [11.2696:2734]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1332 [9.2]
B:B[7.36217] → [11.2774:2812]
BD:B[7.36217] → [11.2774:2812]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1360 [9.2]
B:B[7.37150] → [11.2813:2851]
BD:B[7.37150] → [11.2813:2851]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1386 [9.2]
B:B[7.37982] → [11.2852:2890]
BD:B[7.37982] → [11.2852:2890]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1414 [9.2]
B:B[7.38826] → [11.2891:2929]
BD:B[7.38826] → [11.2891:2929]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1436 [9.2]
B:B[7.39626] → [11.2930:2968]
BD:B[7.39626] → [11.2930:2968]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1454 [9.2]
B:B[7.40403] → [11.2969:3007]
BD:B[7.40403] → [11.2969:3007]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1598 [9.2]
B:B[7.44748] → [11.3164:3202]
BD:B[7.44748] → [11.3164:3202]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1631 [9.2]
B:B[7.45611] → [11.3203:3241]
BD:B[7.45611] → [11.3203:3241]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1658 [9.2]
B:B[7.46337] → [11.3242:3280]
BD:B[7.46337] → [11.3242:3280]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1864 [9.2]
B:B[7.53740] → [11.3320:3358]
BD:B[7.53740] → [11.3320:3358]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1884 [9.2]
B:B[24.355] → [11.3359:3397]
BD:B[24.355] → [11.3359:3397]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1910 [9.2]
B:B[25.353] → [11.3398:3436]
BD:B[25.353] → [11.3398:3436]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1927 [9.2]
B:B[26.344] → [11.3437:3475]
BD:B[26.344] → [11.3437:3475]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 1944 [9.2]
B:B[27.364] → [11.3476:3514]
BD:B[27.364] → [11.3476:3514]
```
  edit.draw(Editor_state, Text_color)
```
Deletion in text_tests.lua at line 1953 [9.2]
B:BD[28.171] → [5.2:75]
BD:BD[28.171] → [5.2:75]
```
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
```
Solving an order conflict in text_tests.lua at line 1953 [9.2]
[27.756]
Deletion in text.lua at line 10 [32.1]
B:BD[29.91] → [30.3:83]
BD:BD[29.91] → [30.3:83]
```
-- return y for the next line, and position of start of final screen line drawn
```
Resurrecting zombie bytes in text.lua at line 10 [32.1]
B:B[30.83] → [31.5:73]
BD:B[30.83] → [31.5:73]
```
function Text.draw(State, line_index, y, startpos, fg, hide_cursor)
```
Insertion in text.lua at line 10 [32.1]
[29.91]
[31.5]
```
-- return y for the next line
```
Insertion in text.lua at line 12 [32.1]
[31.73]
[33.42]
```
--?   print('text.draw', line_index, y)
```
Deletion in text.lua at line 1016 [32.1]
B:BD[29.91] → [10.0:30]
BD:BD[29.91] → [10.0:30]
```
-- return y for the next line
```
Solving an order conflict in text.lua at line 1016 [32.1]
[34.442]

Replacement in edit.lua at line 124 [36.413]

B:BD[35.1000] → [3.59:146]

B:BD[35.1000] → [6.8910:8960]

    y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor)
    y = Text.draw(State, line_index, y, startpos)

[35.1000]

[35.1070]

    y = Text.draw(State, line_index, y, startpos, fg, hide_cursor)

Resurrecting zombie bytes in edit.lua at line 378 [36.413]
B:B[35.10318] → [3.562:610]
BD:B[35.10318] → [3.562:610]
```
    Text.keychord_press(State, chord, readonly)
```
Replacement in edit.lua at line 432 [36.413]
B:BD[35.11811] → [6.9169:9188]
```
  edit.draw(State)
```
[35.11811]
[35.11811]
```
  edit.draw(State, Text_color)
```
Solving an order conflict in app.lua at line 234 [37.2]
[2.748]
[10.8666]
Deletion in app.lua at line 546 [37.2]
B:BD[38.60904] → [10.8793:8925]
BD:BD[38.60904] → [10.8793:8925]
BD:BD[38.60904] → [10.8793:8925]
B:BD[38.61148] → [10.8926:8978]
BD:BD[38.61148] → [10.8926:8978]
BD:BD[38.61148] → [10.8926:8978]
```
  local stack_trace = debug.traceback('', --[[stack frame]]5)  -- most likely to be useful, but set to 0 for a complete stack trace
  -- uncomment this line for a complete stack trace
```

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text_tests.lua at line 231 [9.2]

Replacement in text_tests.lua at line 232 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 321 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 337 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 353 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 405 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 422 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 440 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 462 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 482 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 505 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 529 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 547 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 569 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 586 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 602 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 623 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 640 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 657 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 675 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 698 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 716 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 760 [9.2]

Replacement in text_tests.lua at line 789 [9.2]

Replacement in text_tests.lua at line 808 [9.2]

Replacement in text_tests.lua at line 820 [9.2]

Deletion in text_tests.lua at line 834 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 834 [9.2]

Insertion in text_tests.lua at line 834 [9.2]

Replacement in text_tests.lua at line 867 [9.2]

Replacement in text_tests.lua at line 891 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 919 [9.2]

Deletion in text_tests.lua at line 969 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 979 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1013 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1056 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1083 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1111 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1138 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1171 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1199 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1226 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1253 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1282 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1332 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1360 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1386 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1414 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1436 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1454 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1598 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1631 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1658 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1864 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1884 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1910 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1927 [9.2]

Resurrecting zombie bytes in text_tests.lua at line 1944 [9.2]

Deletion in text_tests.lua at line 1953 [9.2]

Solving an order conflict in text_tests.lua at line 1953 [9.2]

Deletion in text.lua at line 10 [32.1]

Resurrecting zombie bytes in text.lua at line 10 [32.1]

Insertion in text.lua at line 10 [32.1]

Insertion in text.lua at line 12 [32.1]

Deletion in text.lua at line 1016 [32.1]

Solving an order conflict in text.lua at line 1016 [32.1]

Replacement in edit.lua at line 124 [36.413]

Resurrecting zombie bytes in edit.lua at line 378 [36.413]

Replacement in edit.lua at line 432 [36.413]

Solving an order conflict in app.lua at line 234 [37.2]

Deletion in app.lua at line 546 [37.2]