akkartik/pong.love - Change CFHAHDJ5QTWSZFZKJN3TQR45C3IIE2TKWUS5YOCPWWMCLDQ34KIAC

Merge text.love

Created by Kartik K. Agaram on May 6, 2023

CFHAHDJ5QTWSZFZKJN3TQR45C3IIE2TKWUS5YOCPWWMCLDQ34KIAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 35 [6.1]
B:B[4.740] → [5.83539:83575]
BD:B[4.740] → [5.83539:83575]
```
          if State.search_term then
```
Deletion in text.lua at line 36 [6.1]
∅:D[7.458] → [8.1743:1893]
∅:D[5.83575] → [8.1743:1893]
B:BD[7.458] → [8.1743:1893]
BD:BD[7.458] → [8.1743:1893]
B:BD[8.1893] → [9.106:106]
BD:BD[8.1893] → [9.106:106]
```
            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then
```

Resurrecting zombie bytes in text.lua at line 36 [6.1]

B:B[7.458] → [10.3:237]

BD:B[7.458] → [10.3:237]

            local data = State.lines[State.cursor1.line].data
            local cursor_offset = Text.offset(data, State.cursor1.pos)
            if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then

Solving an order conflict in text.lua at line 36 [6.1]
[5.83575]
[10.3]
Resurrecting zombie bytes in text.lua at line 39 [6.1]
∅:∅[9.106] → [4.741:887]
∅:∅[9.106] → [4.741:887]
∅:∅[10.237] → [4.741:887]
B:B[7.608] → [4.741:887]
B:B[7.608] → [4.741:887]
BD:B[9.106] → [4.741:887]
```
              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
```

Deletion in source_text.lua at line 58 [12.83786]

B:BD[2.747] → [2.747:897]

            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then

Resurrecting zombie bytes in source_text.lua at line 58 [12.83786]

B:B[12.88511] → [3.7:241]

BD:B[12.88511] → [3.7:241]

            local data = State.lines[State.cursor1.line].data
            local cursor_offset = Text.offset(data, State.cursor1.pos)
            if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then

Solving an order conflict in source_text.lua at line 58 [12.83786]
[2.747]
[3.7]
Resurrecting zombie bytes in source_text.lua at line 61 [12.83786]
∅:∅[3.241] → [14.1540:1686]
∅:∅[2.897] → [14.1540:1686]
B:B[12.88661] → [14.1540:1686]
BD:B[12.88661] → [14.1540:1686]
```
              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
```

Merge text.love

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 35 [6.1]

Deletion in text.lua at line 36 [6.1]

Resurrecting zombie bytes in text.lua at line 36 [6.1]

Solving an order conflict in text.lua at line 36 [6.1]

Resurrecting zombie bytes in text.lua at line 39 [6.1]

Deletion in source_text.lua at line 58 [12.83786]

Resurrecting zombie bytes in source_text.lua at line 58 [12.83786]

Solving an order conflict in source_text.lua at line 58 [12.83786]

Resurrecting zombie bytes in source_text.lua at line 61 [12.83786]