akkartik/pong.love - Change 5NKF2G4INDOA4PUICLJM2DVFHSVQGFNCYFMGBH3LW45NUX6ADGFQC

Merge text.love

Created by Kartik K. Agaram on July 31, 2023

5NKF2G4INDOA4PUICLJM2DVFHSVQGFNCYFMGBH3LW45NUX6ADGFQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 25 [6.1]
∅:D[2.191] → [5.83301:83326]
B:BD[7.521] → [5.83301:83326]
```
      -- render fragment
```
[2.191]
[5.83326]
```
      -- render any highlights
```
Deletion in text.lua at line 28 [6.1]
B:BD[8.191] → [9.4:35]
BD:BD[8.191] → [9.4:35]
BD:BD[8.191] → [9.4:35]
```
      -- render any highlights
```
Solving an order conflict in text.lua at line 28 [6.1]
[5.83443]
[7.522]
Resurrecting zombie bytes in text.lua at line 29 [6.1]
B:B[7.589] → [5.83444:83454]
BD:B[7.589] → [5.83444:83454]
```
      end
```
Deletion in text.lua at line 30 [6.1]
∅:D[5.83454] → [7.590:618]
B:BD[11.1066] → [7.590:618]
BD:BD[11.1066] → [7.590:618]
B:BD[7.618] → [2.192:242]
BD:BD[7.618] → [2.192:242]
∅:D[2.242] → [5.83455:83491]
B:BD[7.658] → [5.83455:83491]
BD:BD[2.242] → [5.83455:83491]
BD:BD[7.658] → [5.83455:83491]
```
      App.color(Text_color)
      App.screen.print(screen_line, State.left,y)
      -- render cursor if necessary
```
Resurrecting zombie bytes in text.lua at line 30 [6.1]
∅:∅[5.83491] → [5.83491:83538]
B:B[5.83491] → [5.83491:83538]
BD:B[5.83491] → [5.83491:83538]
BD:B[5.83491] → [5.83491:83538]
```
      if line_index == State.cursor1.line then
```
Deletion in text.lua at line 31 [6.1]
∅:D[5.83538] → [7.659:740]
B:BD[13.342] → [7.659:740]
D:D[14.49] → [7.659:740]
BD:BD[13.342] → [7.659:740]
```
        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
```
Resurrecting zombie bytes in text.lua at line 31 [6.1]
B:B[13.342] → [14.4:49]
BD:B[13.342] → [14.4:49]
```
        -- render search highlight or cursor
```
Solving an order conflict in text.lua at line 31 [6.1]
[5.83538]
[14.4]
Deletion in text.lua at line 32 [6.1]
B:BD[7.740] → [5.83539:83575]
BD:BD[7.740] → [5.83539:83575]
B:BD[5.83575] → [3.4:4]
BD:BD[5.83575] → [3.4:4]
```
          if State.search_term then
```
Resurrecting zombie bytes in text.lua at line 32 [6.1]
B:B[14.49] → [12.4:38]
BD:B[14.49] → [12.4:38]
```
        if State.search_term then
```
Deletion in text.lua at line 33 [6.1]
∅:D[3.4] → [17.3:237]
B:BD[13.458] → [17.3:237]
D:D[18.86] → [17.3:237]
D:D[12.121] → [17.3:237]
BD:BD[13.458] → [17.3:237]
BD:BD[13.458] → [17.3:237]
∅:D[19.106] → [7.741:887]
∅:D[17.237] → [7.741:887]
B:BD[19.106] → [7.741:887]
B:BD[13.608] → [7.741:887]
D:D[19.106] → [7.741:887]
D:D[17.237] → [7.741:887]
BD:BD[17.237] → [7.741:887]
BD:BD[13.608] → [7.741:887]
B:BD[7.887] → [5.83576:83612]
BD:BD[7.887] → [5.83576:83612]
BD:BD[7.887] → [5.83576:83612]
BD:BD[7.887] → [5.83576:83612]
∅:D[5.83612] → [7.888:961]
B:BD[13.774] → [7.888:961]
BD:BD[13.774] → [7.888:961]
B:BD[7.961] → [2.244:244]
BD:BD[7.961] → [2.244:244]
∅:D[2.244] → [5.83613:83644]
B:BD[7.961] → [5.83613:83644]
BD:BD[7.961] → [5.83613:83644]
B:BD[5.83644] → [2.245:341]
∅:D[2.341] → [5.83645:83681]
B:BD[7.1048] → [5.83645:83681]
```
            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))
              App.color(Text_color)
              love.graphics.print(State.search_term, State.left+lo_px,y)
            end
          else
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          end
        end
      end
```

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

B:B[12.38] → [16.4:586]

BD:B[12.38] → [16.4:586]

∅:∅[16.586] → [12.122:149]

B:B[13.854] → [12.122:149]

BD:B[13.854] → [12.122:149]

B:B[12.149] → [18.87:571]

BD:B[12.149] → [18.87:571]

B:B[22.2604] → [9.126:229]

BD:B[22.2604] → [9.126:229]

          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
          end
        else
          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.
      -- render fragment
      App.color(Text_color)
      App.screen.print(screen_line, State.left,y)

Insertion in text.lua at line 49 [6.1]

[18.571]

[9.126]

            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          end
        end
      end

Deletion in source_text.lua at line 27 [25.83786]
∅:D[23.237] → [24.614:651]
B:BD[24.614] → [24.614:651]
D:D[23.237] → [24.614:651]
BD:BD[24.614] → [24.614:651]
```
      -- render any link decorations
```
Resurrecting zombie bytes in source_text.lua at line 28 [25.83786]
∅:∅[4.39] → [24.651:714]
B:B[24.651] → [24.651:714]
BD:B[24.651] → [24.651:714]
```
      for _,link_offsets in ipairs(line_cache.link_offsets) do
```

Resurrecting zombie bytes in source_text.lua at line 30 [25.83786]

∅:∅[4.75] → [24.714:1233]

B:B[24.714] → [24.714:1233]

BD:B[24.714] → [24.714:1233]

B:B[24.1233] → [26.522:544]

BD:B[24.1233] → [26.522:544]

B:B[24.1259] → [26.545:662]

BD:B[24.1259] → [26.545:662]

        local s,e,filename = unpack(link_offsets)
        local lo, hi = Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)
        if lo then
          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, color={1,1,1},
            icon = icon.hyperlink_decoration,
            onpress1 = function()
                         if file_exists(filename) then
                           source.switch_to_file(filename)
                         end
                       end,
          })
        end
      end
      if State.selection1.line then
        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)

Deletion in source_text.lua at line 43 [25.83786]
∅:D[26.544] → [24.1234:1259]
B:BD[27.20777] → [24.1234:1259]
BD:BD[27.20777] → [24.1234:1259]
```
      -- render fragment
```

Deletion in source_text.lua at line 47 [25.83786]

B:BD[2.400] → [2.400:601]

∅:D[2.601] → [26.663:673]

B:BD[24.1327] → [26.663:673]

B:BD[24.1390] → [26.674:710]

BD:BD[24.1390] → [26.674:710]

      -- render colorized text
      local x = State.left
      for frag in screen_line:gmatch('%S*%s*') do
        select_color(frag)
        App.screen.print(frag, x,y)
        x = x+App.width(frag)
      end
      -- render cursor if necessary

Resurrecting zombie bytes in source_text.lua at line 47 [25.83786]

B:B[25.88252] → [4.76:1470]

BD:B[25.88252] → [4.76:1470]

      if not hide_cursor and line_index == State.cursor1.line then
        -- render search highlight or cursor
        if State.search_term 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 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
          end
        elseif Focus == 'edit' then
          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.
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          end
        end
      end

Solving an order conflict in source_text.lua at line 47 [25.83786]
[2.400]
[4.76]

Replacement in source_text.lua at line 70 [25.83786]

∅:D[26.710] → [24.1391:1539]

B:BD[25.88326] → [24.1391:1539]

BD:BD[25.88326] → [24.1391:1539]

B:BD[24.1539] → [26.711:747]

BD:BD[24.1539] → [26.711:747]

B:BD[26.747] → [3.10:10]

BD:BD[26.747] → [3.10:10]

∅:D[3.10] → [29.7:241]

B:BD[25.88511] → [29.7:241]

BD:BD[25.88511] → [29.7:241]

∅:D[29.241] → [24.1540:1686]

∅:D[26.897] → [24.1540:1686]

B:BD[25.88661] → [24.1540:1686]

D:D[29.241] → [24.1540:1686]

BD:BD[29.241] → [24.1540:1686]

BD:BD[25.88661] → [24.1540:1686]

B:BD[24.1686] → [26.898:934]

BD:BD[24.1686] → [26.898:934]

∅:D[26.934] → [24.1687:1760]

B:BD[25.88834] → [24.1687:1760]

BD:BD[25.88834] → [24.1687:1760]

B:BD[24.1760] → [26.935:989]

BD:BD[24.1760] → [26.935:989]

B:BD[26.989] → [2.602:698]

∅:D[2.698] → [26.990:1016]

B:BD[24.1847] → [26.990:1016]

      if not hide_cursor and line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
          if State.search_term 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 lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
              App.color(Text_color)
              love.graphics.print(State.search_term, State.left+lo_px,y)
            end
          elseif Focus == 'edit' then
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          end
        end

[4.1470]

[26.1016]

      -- render colorized text
      local x = State.left
      for frag in screen_line:gmatch('%S*%s*') do
        select_color(frag)
        App.screen.print(frag, x,y)
        x = x+App.width(frag)

Resurrecting zombie bytes in source_text.lua at line 77 [25.83786]
∅:∅[26.1026] → [24.1848:1941]
B:B[25.89102] → [24.1848:1941]
BD:B[25.89102] → [24.1848:1941]
```
      y = y + State.line_height
      if y >= App.screen.height then
        break
      end
```

Merge text.love

Dependencies

In channels

Change contents

Replacement in text.lua at line 25 [6.1]

Deletion in text.lua at line 28 [6.1]

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

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

Deletion in text.lua at line 30 [6.1]

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

Deletion in text.lua at line 31 [6.1]

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

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

Deletion in text.lua at line 32 [6.1]

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

Deletion in text.lua at line 33 [6.1]

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

Insertion in text.lua at line 49 [6.1]

Deletion in source_text.lua at line 27 [25.83786]

Resurrecting zombie bytes in source_text.lua at line 28 [25.83786]

Resurrecting zombie bytes in source_text.lua at line 30 [25.83786]

Deletion in source_text.lua at line 43 [25.83786]

Deletion in source_text.lua at line 47 [25.83786]

Resurrecting zombie bytes in source_text.lua at line 47 [25.83786]

Solving an order conflict in source_text.lua at line 47 [25.83786]

Replacement in source_text.lua at line 70 [25.83786]

Resurrecting zombie bytes in source_text.lua at line 77 [25.83786]