akkartik/sokoban.love - Change IM7UEBMKYG6UT2MS34ZUVM5ZLN5YUZXOHJ6GVUSFMHRAK3JKULBQC

bugfix: highlight search patterns on the right line

scenario:

position a wrapped line on screen
search for the word immediately after the point of wrapping

Before this commit the word would be highlighted twice:

at the end of the first screen line
at the start of the second screen line

Now it shows up at the right place.

Created by Kartik K. Agaram on July 31, 2023

IM7UEBMKYG6UT2MS34ZUVM5ZLN5YUZXOHJ6GVUSFMHRAK3JKULBQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 35 [3.1]

B:BD[2.38] → [2.38:121]

          if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then

[2.38]

[4.3]

          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then

Replacement in text.lua at line 45 [3.1]

B:BD[2.149] → [2.149:232]

          if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then

[2.149]

[5.243]

          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          elseif pos + frag_len == State.cursor1.pos then
            -- Show cursor at end of line.
            -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing.
            -- It seems useful to see a cursor whether your eye is on the left or right margin.

Replacement in source_text.lua at line 57 [6.83723]

B:BD[2.271] → [2.271:354]

          if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then

[2.271]

[4.242]

          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then

Replacement in source_text.lua at line 67 [6.83723]

B:BD[2.405] → [2.405:488]

          if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then

[2.405]

[5.626]

          if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          elseif pos + frag_len == State.cursor1.pos then
            -- Show cursor at end of line.
            -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing.
            -- It seems useful to see a cursor whether your eye is on the left or right margin.