akkartik/pong.love - Change 5NKJUM5IV5M64YRK3A2UWFJWEJ4V5PFLDEWGDOL263FLZ2SFQAVAC

Merge text.love

Created by Kartik K. Agaram on April 9, 2023

5NKJUM5IV5M64YRK3A2UWFJWEJ4V5PFLDEWGDOL263FLZ2SFQAVAC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 20 [5.1]
B:BD[4.83260] → [4.83260:83291]
```
--?       print('skipping', f)
```

Deletion in text.lua at line 22 [5.1]

B:BD[6.363] → [6.363:521]

BD:BD[6.363] → [6.363:521]

      local f = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', f, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(f)

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

B:B[6.521] → [4.83301:83443]

BD:B[6.521] → [4.83301:83443]

      -- render fragment
      if State.selection1.line then
        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)

Insertion in text.lua at line 22 [5.1]

[6.363]

[4.83301]

      local screen_line = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(screen_line)

Deletion in text.lua at line 31 [5.1]
B:BD[6.618] → [6.618:658]
BD:BD[6.618] → [6.618:658]
```
      App.screen.print(f, State.left,y)
```
Resurrecting zombie bytes in text.lua at line 31 [5.1]
B:B[6.658] → [4.83455:83538]
BD:B[6.658] → [4.83455:83538]
```
      -- render cursor if necessary
      if line_index == State.cursor1.line then
```

Insertion in text.lua at line 31 [5.1]

[6.618]

[4.83455]

      App.screen.print(screen_line, State.left,y)

Deletion in text.lua at line 40 [5.1]

B:BD[6.618] → [7.192:242]

BD:BD[6.618] → [7.192:242]

B:BD[6.363] → [7.3:191]

BD:BD[6.363] → [7.3:191]

      App.screen.print(screen_line, State.left,y)
      local screen_line = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(screen_line)

Resurrecting zombie bytes in text.lua at line 40 [5.1]
B:B[6.961] → [4.83613:83644]
BD:B[6.961] → [4.83613:83644]
B:B[6.1048] → [4.83645:83681]
BD:B[6.1048] → [4.83645:83681]
```
            end
          else
          end
        end
      end
```
Solving an order conflict in text.lua at line 40 [5.1]
[6.961]
[4.83613]

Replacement in text.lua at line 42 [5.1]

∅:D[4.83644] → [6.962:1048]

B:BD[9.869] → [6.962:1048]

BD:BD[9.869] → [6.962:1048]

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

[4.83644]

[4.83645]

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

Deletion in text.lua at line 917 [5.1]
B:BD[4.115545] → [2.107:107]
B:BD[9.869] → [7.243:339]
BD:BD[9.869] → [7.243:339]
BD:BD[9.869] → [7.243:339]
```
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
```
Solving an order conflict in text.lua at line 917 [5.1]
[4.115545]
Replacement in source_text.lua at line 21 [11.83786]
B:BD[8.87357] → [4.115732:115763]
```
--?       print('skipping', f)
```
[8.87357]
[8.87391]
```
--?       print('skipping', screen_line)
```

Deletion in source_text.lua at line 24 [11.83786]

B:BD[12.456] → [12.456:614]

BD:BD[12.456] → [12.456:614]

      local f = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', f, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(f)

Resurrecting zombie bytes in source_text.lua at line 27 [11.83786]

∅:∅[3.237] → [12.614:1233]

B:B[12.614] → [12.614:1233]

BD:B[12.614] → [12.614:1233]

      -- render any link decorations
      for _,link_offsets in ipairs(line_cache.link_offsets) do
        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,
          })

Resurrecting zombie bytes in source_text.lua at line 46 [11.83786]
B:B[12.1327] → [2.663:673]
BD:B[12.1327] → [2.663:673]
B:B[12.1390] → [2.674:710]
BD:B[12.1390] → [2.674:710]
```
      end
      -- render cursor if necessary
```

Insertion in source_text.lua at line 46 [11.83786]

[12.1327]

[2.663]

      end
      -- 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)

Deletion in source_text.lua at line 54 [11.83786]
∅:D[2.673] → [12.1328:1390]
B:BD[11.88252] → [12.1328:1390]
BD:BD[11.88252] → [12.1328:1390]
```
      select_color(f)
      App.screen.print(f, State.left,y)
```
Resurrecting zombie bytes in source_text.lua at line 62 [11.83786]
B:B[12.1760] → [2.935:989]
BD:B[12.1760] → [2.935:989]
B:B[12.1847] → [2.990:1026]
BD:B[12.1847] → [2.990:1026]
```
            end
          elseif Focus == 'edit' then
          end
        end
      end
```

Replacement in source_text.lua at line 64 [11.83786]

∅:D[2.989] → [12.1761:1847]

B:BD[11.88952] → [12.1761:1847]

BD:BD[11.88952] → [12.1761:1847]

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

[2.989]

[2.990]

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

Deletion in source_text.lua at line 1065 [11.83786]

B:BD[11.87788] → [3.7:48]

BD:BD[11.87788] → [3.7:48]

B:BD[11.88252] → [3.238:449]

BD:BD[11.88252] → [3.238:449]

B:BD[11.88952] → [3.450:546]

BD:BD[11.88952] → [3.450:546]

--?       print('skipping', screen_line)
      -- 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
            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

Solving an order conflict in source_text.lua at line 1065 [11.83786]
[14.7206]

Merge text.love

Dependencies

In channels

Change contents

Deletion in text.lua at line 20 [5.1]

Deletion in text.lua at line 22 [5.1]

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

Insertion in text.lua at line 22 [5.1]

Deletion in text.lua at line 31 [5.1]

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

Insertion in text.lua at line 31 [5.1]

Deletion in text.lua at line 40 [5.1]

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

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

Replacement in text.lua at line 42 [5.1]

Deletion in text.lua at line 917 [5.1]

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

Replacement in source_text.lua at line 21 [11.83786]

Deletion in source_text.lua at line 24 [11.83786]

Resurrecting zombie bytes in source_text.lua at line 27 [11.83786]

Resurrecting zombie bytes in source_text.lua at line 46 [11.83786]

Insertion in source_text.lua at line 46 [11.83786]

Deletion in source_text.lua at line 54 [11.83786]

Resurrecting zombie bytes in source_text.lua at line 62 [11.83786]

Replacement in source_text.lua at line 64 [11.83786]

Deletion in source_text.lua at line 1065 [11.83786]

Solving an order conflict in source_text.lua at line 1065 [11.83786]