akkartik/sokoban.love - Change 2N3HLCOVSSOTQQULZRVXUQXGTOG4RBR6ZSSCY55JTB65GEYYNOFQC

Merge text0

Created by Kartik K. Agaram on May 6, 2023

2N3HLCOVSSOTQQULZRVXUQXGTOG4RBR6ZSSCY55JTB65GEYYNOFQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 41 [5.1]

B:B[4.1893] → [2.26:172]

BD:B[4.1893] → [2.26:172]

              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

Insertion in text.lua at line 41 [5.1]

[6.458]

[2.26]

            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

Deletion in text.lua at line 925 [5.1]

B:BD[7.442] → [8.59:59]

B:BD[6.458] → [9.3:237]

BD:BD[6.458] → [9.3:237]

∅:D[10.106] → [11.741:887]

∅:D[9.237] → [11.741:887]

B:BD[6.608] → [11.741:887]

D:D[10.106] → [11.741:887]

BD:BD[6.608] → [11.741:887]

            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
              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

Solving an order conflict in text.lua at line 925 [5.1]
[7.442]