akkartik/sokoban.love - Change BMGHJX7GIX535K2DU7ZT4EP2O6MYS7QVING22AAJABUY53K2PLFAC

bugfix: search highlight straddling screen lines

Created by Kartik K. Agaram on July 31, 2023

BMGHJX7GIX535K2DU7ZT4EP2O6MYS7QVING22AAJABUY53K2PLFAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 33 [5.1]

B:BD[4.38] → [2.4:86]

∅:D[2.86] → [6.3:237]

∅:D[4.121] → [6.3:237]

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

B:BD[6.237] → [8.4:75]

B:BD[8.75] → [3.36:125]

∅:D[3.125] → [7.838:854]

∅:D[9.961] → [7.838:854]

B:BD[7.838] → [7.838:854]

          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
            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 hi = State.cursor1.pos+utf8.len(State.search_term)
              Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, hi)
            end

[4.38]

[4.122]

          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 save_selection = State.selection1
            State.selection1 = {line=line_index, pos=State.cursor1.pos+utf8.len(State.search_term)}
            local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
            Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
            State.selection1 = save_selection

Replacement in source_text.lua at line 50 [10.83723]

B:BD[4.271] → [2.576:658]

∅:D[4.354] → [6.242:476]

∅:D[2.658] → [6.242:476]

B:BD[10.88448] → [6.242:476]

B:BD[6.476] → [8.183:254]

B:BD[8.254] → [3.266:355]

∅:D[3.355] → [10.88835:88851]

∅:D[11.1760] → [10.88835:88851]

B:BD[10.88835] → [10.88835:88851]

          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
            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 hi = State.cursor1.pos+utf8.len(State.search_term)
              Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, hi)
            end

[4.271]

[4.355]

          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 save_selection = State.selection1
            State.selection1 = {line=line_index, pos=State.cursor1.pos+utf8.len(State.search_term)}
            local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
            Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
            State.selection1 = save_selection