akkartik/sokoban.love - Change VZJHGWSPFPIBTAEIAXTMKPG5BCNEW3L2DDK5ZMC76WPWHRS3OG2QC

Merge lines.love

Created by Kartik K. Agaram on December 13, 2022

VZJHGWSPFPIBTAEIAXTMKPG5BCNEW3L2DDK5ZMC76WPWHRS3OG2QC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 188 [5.413]

B:BD[5.10292] → [3.26:273]

    local drawing_index, drawing = Drawing.current_drawing(State)
    if drawing_index == nil then
      for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
      Text.textinput(State, t)
    end

[5.10292]

[5.10314]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    Text.textinput(State, t)

Replacement in drawing_tests.lua at line 188 [6.15]
B:BD[2.11183] → [2.11183:11228]
```
  edit.run_after_keychord(Editor_state, 'o')
```
[2.11183]
[2.11228]
```
  edit.run_after_textinput(Editor_state, 'o')
```

Replacement in drawing_tests.lua at line 217 [6.15]

B:BD[2.13005] → [2.13005:13063]

  edit.run_after_keychord(Editor_state, 'a')  -- arc mode

[2.13005]

[2.13063]

  edit.run_after_textinput(Editor_state, 'a')  -- arc mode

Replacement in drawing_tests.lua at line 248 [6.15]

B:BD[2.14912] → [2.14912:14974]

  edit.run_after_keychord(Editor_state, 'g')  -- polygon mode

[2.14912]

[2.14974]

  edit.run_after_textinput(Editor_state, 'g')  -- polygon mode

Replacement in drawing_tests.lua at line 251 [6.15]

B:BD[2.15072] → [2.15072:15131]

  edit.run_after_keychord(Editor_state, 'p')  -- add point

[2.15072]

[2.15131]

  edit.run_after_textinput(Editor_state, 'p')  -- add point

Replacement in drawing_tests.lua at line 287 [6.15]

B:BD[2.17155] → [2.17155:17219]

  edit.run_after_keychord(Editor_state, 'r')  -- rectangle mode

[2.17155]

[2.17219]

  edit.run_after_textinput(Editor_state, 'r')  -- rectangle mode

Replacement in drawing_tests.lua at line 290 [6.15]
B:BD[2.17328] → [2.17328:17373]
```
  edit.run_after_keychord(Editor_state, 'p')
```
[2.17328]
[2.17373]
```
  edit.run_after_textinput(Editor_state, 'p')
```
Replacement in drawing_tests.lua at line 293 [6.15]
B:BD[2.17491] → [2.17491:17536]
```
  edit.run_after_keychord(Editor_state, 'p')
```
[2.17491]
[2.17536]
```
  edit.run_after_textinput(Editor_state, 'p')
```

Replacement in drawing_tests.lua at line 332 [6.15]

B:BD[2.19937] → [2.19937:20001]

  edit.run_after_keychord(Editor_state, 'r')  -- rectangle mode

[2.19937]

[2.20001]

  edit.run_after_textinput(Editor_state, 'r')  -- rectangle mode

Replacement in drawing_tests.lua at line 335 [6.15]
B:BD[2.20110] → [2.20110:20155]
```
  edit.run_after_keychord(Editor_state, 'p')
```
[2.20110]
[2.20155]
```
  edit.run_after_textinput(Editor_state, 'p')
```
Replacement in drawing_tests.lua at line 338 [6.15]
B:BD[2.20273] → [2.20273:20318]
```
  edit.run_after_keychord(Editor_state, 'p')
```
[2.20273]
[2.20318]
```
  edit.run_after_textinput(Editor_state, 'p')
```

Replacement in drawing_tests.lua at line 369 [6.15]

B:BD[2.22232] → [2.22232:22293]

  edit.run_after_keychord(Editor_state, 's')  -- square mode

[2.22232]

[2.22293]

  edit.run_after_textinput(Editor_state, 's')  -- square mode

Replacement in drawing_tests.lua at line 372 [6.15]
B:BD[2.22402] → [2.22402:22447]
```
  edit.run_after_keychord(Editor_state, 'p')
```
[2.22402]
[2.22447]
```
  edit.run_after_textinput(Editor_state, 'p')
```
Replacement in drawing_tests.lua at line 375 [6.15]
B:BD[2.22565] → [2.22565:22610]
```
  edit.run_after_keychord(Editor_state, 'p')
```
[2.22565]
[2.22610]
```
  edit.run_after_textinput(Editor_state, 'p')
```
Deletion in drawing_tests.lua at line 433 [6.15]
B:BD[7.2495] → [3.275:321]
BD:BD[7.2495] → [3.275:321]
B:BD[7.2910] → [9.74:133]
BD:BD[7.2910] → [9.74:133]
B:BD[7.3256] → [9.134:197]
BD:BD[7.3256] → [9.134:197]
B:BD[7.3337] → [9.198:258]
BD:BD[7.3337] → [9.198:258]
B:BD[7.3672] → [9.259:324]
BD:BD[7.3672] → [9.259:324]
B:BD[7.3753] → [9.325:371]
BD:BD[7.3753] → [9.325:371]
B:BD[7.3834] → [9.372:418]
BD:BD[7.3834] → [9.372:418]
B:BD[7.4182] → [9.419:484]
BD:BD[7.4182] → [9.419:484]
B:BD[7.4263] → [9.485:531]
BD:BD[7.4263] → [9.485:531]
B:BD[7.4344] → [9.532:578]
BD:BD[7.4344] → [9.532:578]
B:BD[7.4564] → [9.579:641]
BD:BD[7.4564] → [9.579:641]
B:BD[7.4645] → [9.642:688]
BD:BD[7.4645] → [9.642:688]
B:BD[7.4726] → [9.689:735]
BD:BD[7.4726] → [9.689:735]
```
  edit.run_after_textinput(Editor_state, 'o')
  edit.run_after_textinput(Editor_state, 'a')  -- arc mode
  edit.run_after_textinput(Editor_state, 'g')  -- polygon mode
  edit.run_after_textinput(Editor_state, 'p')  -- add point
  edit.run_after_textinput(Editor_state, 'r')  -- rectangle mode
  edit.run_after_textinput(Editor_state, 'p')
  edit.run_after_textinput(Editor_state, 'p')
  edit.run_after_textinput(Editor_state, 'r')  -- rectangle mode
  edit.run_after_textinput(Editor_state, 'p')
  edit.run_after_textinput(Editor_state, 'p')
  edit.run_after_textinput(Editor_state, 's')  -- square mode
  edit.run_after_textinput(Editor_state, 'p')
  edit.run_after_textinput(Editor_state, 'p')
```
Solving an order conflict in drawing_tests.lua at line 433 [6.15]
[2.25706]
[10.971]

Replacement in drawing_tests.lua at line 597 [6.15]

B:BD[2.34297] → [2.34297:34359]

  edit.run_after_keychord(Editor_state, 'g')  -- polygon mode

[2.34297]

[2.34359]

  edit.run_after_textinput(Editor_state, 'g')  -- polygon mode

Replacement in drawing_tests.lua at line 600 [6.15]

B:BD[2.34457] → [2.34457:34516]

  edit.run_after_keychord(Editor_state, 'p')  -- add point

[2.34457]

[2.34516]

  edit.run_after_textinput(Editor_state, 'p')  -- add point

Replacement in drawing_tests.lua at line 603 [6.15]

B:BD[2.34613] → [2.34613:34672]

  edit.run_after_keychord(Editor_state, 'p')  -- add point

[2.34613]

[2.34672]

  edit.run_after_textinput(Editor_state, 'p')  -- add point

Replacement in drawing_tests.lua at line 629 [6.15]

B:BD[2.36079] → [2.36079:36141]

  edit.run_after_keychord(Editor_state, 'g')  -- polygon mode

[2.36079]

[2.36141]

  edit.run_after_textinput(Editor_state, 'g')  -- polygon mode

Replacement in drawing_tests.lua at line 632 [6.15]

B:BD[2.36239] → [2.36239:36298]

  edit.run_after_keychord(Editor_state, 'p')  -- add point

[2.36239]

[2.36298]

  edit.run_after_textinput(Editor_state, 'p')  -- add point

Deletion in drawing_tests.lua at line 687 [6.15]
B:BD[7.6915] → [9.736:799]
BD:BD[7.6915] → [9.736:799]
B:BD[7.6996] → [9.800:860]
BD:BD[7.6996] → [9.800:860]
B:BD[7.7077] → [9.861:921]
BD:BD[7.7077] → [9.861:921]
B:BD[7.7378] → [9.922:985]
BD:BD[7.7378] → [9.922:985]
B:BD[7.7459] → [9.986:1046]
BD:BD[7.7459] → [9.986:1046]
```
  edit.run_after_textinput(Editor_state, 'g')  -- polygon mode
  edit.run_after_textinput(Editor_state, 'p')  -- add point
  edit.run_after_textinput(Editor_state, 'p')  -- add point
  edit.run_after_textinput(Editor_state, 'g')  -- polygon mode
  edit.run_after_textinput(Editor_state, 'p')  -- add point
```
Solving an order conflict in drawing_tests.lua at line 687 [6.15]
[2.39401]
[10.1119]
Deletion in drawing_tests.lua at line 786 [6.15]
B:BD[7.2165] → [4.27:72]
BD:BD[7.2165] → [4.27:72]
```
  edit.run_after_keychord(Editor_state, 'o')
```
Solving an order conflict in drawing_tests.lua at line 786 [6.15]
[2.44405]

Merge lines.love

Dependencies

In channels

Change contents

Replacement in edit.lua at line 188 [5.413]

Replacement in drawing_tests.lua at line 188 [6.15]

Replacement in drawing_tests.lua at line 217 [6.15]

Replacement in drawing_tests.lua at line 248 [6.15]

Replacement in drawing_tests.lua at line 251 [6.15]

Replacement in drawing_tests.lua at line 287 [6.15]

Replacement in drawing_tests.lua at line 290 [6.15]

Replacement in drawing_tests.lua at line 293 [6.15]

Replacement in drawing_tests.lua at line 332 [6.15]

Replacement in drawing_tests.lua at line 335 [6.15]

Replacement in drawing_tests.lua at line 338 [6.15]

Replacement in drawing_tests.lua at line 369 [6.15]

Replacement in drawing_tests.lua at line 372 [6.15]

Replacement in drawing_tests.lua at line 375 [6.15]

Deletion in drawing_tests.lua at line 433 [6.15]

Solving an order conflict in drawing_tests.lua at line 433 [6.15]

Replacement in drawing_tests.lua at line 597 [6.15]

Replacement in drawing_tests.lua at line 600 [6.15]

Replacement in drawing_tests.lua at line 603 [6.15]

Replacement in drawing_tests.lua at line 629 [6.15]

Replacement in drawing_tests.lua at line 632 [6.15]

Deletion in drawing_tests.lua at line 687 [6.15]

Solving an order conflict in drawing_tests.lua at line 687 [6.15]

Deletion in drawing_tests.lua at line 786 [6.15]

Solving an order conflict in drawing_tests.lua at line 786 [6.15]