akkartik/pong.love - Change PTTZ7YRF3AKTO3LKL2PDC67H34NFKY2FRWL5HK6PZ2YWLPT5IUAAC

Merge text.love

Created by Kartik K. Agaram on April 3, 2023

PTTZ7YRF3AKTO3LKL2PDC67H34NFKY2FRWL5HK6PZ2YWLPT5IUAAC

Dependencies

In channels

main

Change contents

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[6.2] → [7.202684:202723]

BFD:BFD[7.202723] → [7.191243:191243]

B:BD[7.196035] → [5.4718:4778]

∅:D[5.4778] → [7.196099:197122]

          Text.draw(State, line_index, y, --[[startpos]] 1)
          State.left,State.right = old_left,old_right
        else
          height = log_render[line.data.name](line.data, xleft, y, xright-xleft)
        end
      end
      if App.mouse_x() > Log_browser_state.left and line_index == mouse_line_index then
        App.color(Cursor_line_background_color)
        love.graphics.rectangle('fill', xleft,y, xright-xleft, height)
      end
      y = y + height
    end
  end
end
function render_stack_left_margin(State, line_index, line, y)
  if line.section_stack == nil then
    -- assertion message
    for k,v in pairs(line) do
      print(k)
    end
  end
  App.color(Section_border_color)
  for i=1,#line.section_stack do
    local x = State.left + (i-1)*Section_border_padding_horizontal
    love.graphics.line(x,y, x,y+log_browser.height(State, line_index))
    if y < 30 then
      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, y+5, --[[vertically]] math.pi/2)
    end
    if y > App.screen.height-log_browser.height(State, line_index) then

Deletion in undo.lua at line 61 [9.1]
∅:D[2.2009] → [8.2:2]
B:BD[10.33] → [8.2:2]
BD:BD[10.33] → [8.2:2]
Deletion in text.lua at line 1 [13.1]
B:BD[12.91] → [3.3:83]
BD:BD[12.91] → [3.3:83]
BD:BD[12.91] → [3.3:83]
B:BD[12.214] → [15.44:84]
BD:BD[12.214] → [15.44:84]
BD:BD[12.214] → [15.44:84]
```
-- return y for the next line, and position of start of final screen line drawn
--?   print('text.draw', line_index, y)
```

Replacement in text.lua at line 5 [13.1]

B:BD[2.82878] → [2.82878:82950]

-- return the final y, and position of start of final screen line drawn

[2.82878]

[2.82950]

-- return y for the next line, and position of start of final screen line drawn

Resurrecting zombie bytes in text.lua at line 51 [13.1]
B:B[15.1142] → [2.83682:83696]
BD:B[15.1142] → [2.83682:83696]
```
    end
  end
```
Deletion in text.lua at line 53 [13.1]
∅:D[2.83696] → [15.1143:1206]
B:BD[16.37] → [15.1143:1206]
BD:BD[16.37] → [15.1143:1206]
```
  return y - State.line_height, final_screen_line_starting_pos
```
Resurrecting zombie bytes in text.lua at line 53 [13.1]
B:B[16.37] → [3.84:127]
BD:B[16.37] → [3.84:127]
```
  return y, final_screen_line_starting_pos
```
Solving an order conflict in text.lua at line 53 [13.1]
[2.83696]
[3.84]

Resurrecting zombie bytes in text.lua at line 54 [13.1]

∅:∅[3.127] → [15.1206:1441]

B:B[15.1206] → [15.1206:1441]

BD:B[15.1206] → [15.1206:1441]

end
function Text.screen_line(line, line_cache, i)
  local pos = line_cache.screen_line_starting_pos[i]
  local offset = Text.offset(line.data, pos)
  if i >= #line_cache.screen_line_starting_pos then
    return line.data:sub(offset)

Deletion in text.lua at line 72 [13.1]
B:BD[2.83903] → [2.83903:83929]
```
    App.color(Text_color)
```
Replacement in text.lua at line 862 [13.1]
B:BD[2.114330] → [2.114330:114343]
```
  App.draw()
```
[2.114330]
[2.114343]
```
  edit.draw(State)
```
Deletion in text.lua at line 918 [13.1]
B:BD[17.223] → [4.3:22]
BD:BD[17.223] → [4.3:22]
```
  edit.draw(State)
```
Solving an order conflict in text.lua at line 918 [13.1]
[2.115545]
Replacement in source_text_tests.lua at line 980 [7.3561]
B:BD[11.35770] → [18.7605:7647]
```
  App.screen.check(y, 'mno ', 'screen:3')
```
[11.35770]
[11.35874]
```
  App.screen.check(y, 'mn', 'screen:3')
```
Deletion in source_text_tests.lua at line 2035 [7.3561]
B:BD[18.19858] → [19.968:968]
B:BD[7.35939] → [5.6:46]
BD:BD[7.35939] → [5.6:46]
```
  App.screen.check(y, 'mn', 'screen:3')
```
Solving an order conflict in source_text_tests.lua at line 2035 [7.3561]
[18.19858]

Replacement in source_text.lua at line 5 [7.83786]

B:BD[11.83750] → [19.970:1042]

-- return the final y, and position of start of final screen line drawn

[11.83750]

[19.1042]

-- return y for the next line, and position of start of final screen line drawn

Replacement in source_text.lua at line 12 [7.83786]
B:BD[19.1128] → [19.1128:1167]
∅:D[19.1167] → [11.86937:86981]
B:BD[11.86937] → [11.86937:86981]
```
  local x = State.left
  local pos = 1
  local screen_line_starting_pos = startpos
```
[19.1128]
[2.115550]
```
  local final_screen_line_starting_pos = startpos  -- track value to return
```
Replacement in source_text.lua at line 14 [7.83786]
∅:D[2.115610] → [11.87025:87041]
B:BD[11.87025] → [11.87025:87041]
```
  local pos = 1
```
[2.115610]
[11.87041]
```
  Text.populate_link_offsets(State, line_index)
```

Replacement in source_text.lua at line 16 [7.83786]

B:BD[11.87062] → [11.87062:87134]

B:BD[11.87134] → [2.115611:115731]

  for _, f in ipairs(line_cache.fragments) do
    App.color(Text_color)
    select_color(f)
    local frag_len = utf8.len(f)
--?     print('text.draw:', f, 'at', line_index,pos, 'after', x,y)

[11.87062]

[11.87306]

  assert(#line_cache.screen_line_starting_pos >= 1)
  for i=1,#line_cache.screen_line_starting_pos do
    local pos = line_cache.screen_line_starting_pos[i]

Deletion in source_text.lua at line 23 [7.83786]

B:BD[11.87400] → [11.87400:87425]

B:BD[11.87425] → [2.115764:115802]

∅:D[2.115802] → [11.87471:87659]

B:BD[11.87471] → [11.87471:87659]

B:BD[11.87659] → [19.1168:1213]

∅:D[19.1213] → [11.87737:87811]

B:BD[11.87737] → [11.87737:87811]

B:BD[11.87811] → [21.4:14]

B:BD[21.14] → [22.16477:16662]

∅:D[22.16662] → [21.14:91]

B:BD[21.14] → [21.14:91]

B:BD[21.91] → [2.115803:115888]

∅:D[2.115888] → [21.179:374]

B:BD[21.179] → [21.179:374]

B:BD[21.374] → [2.115889:116007]

∅:D[2.116007] → [21.585:776]

B:BD[21.585] → [21.585:776]

∅:D[21.776] → [11.87811:87821]

B:BD[11.87811] → [11.87811:87821]

B:BD[11.87821] → [2.116008:116039]

∅:D[2.116039] → [11.87859:87895]

B:BD[11.87859] → [11.87859:87895]

B:BD[11.87895] → [19.1214:1261]

∅:D[19.1261] → [11.87964:88521]

B:BD[11.87964] → [11.87964:88521]

B:BD[11.88521] → [2.116040:116117]

∅:D[2.116117] → [11.88601:88735]

B:BD[11.88601] → [11.88601:88735]

B:BD[11.88735] → [19.1262:1447]

∅:D[19.1447] → [11.90651:90659]

B:BD[11.90651] → [11.90651:90659]

B:BD[11.90684] → [11.90684:90690]

B:BD[11.90690] → [19.1448:1485]

∅:D[19.1485] → [11.90741:91117]

B:BD[11.90741] → [11.90741:91117]

B:BD[11.91117] → [2.116119:116119]

∅:D[23.193] → [24.3883:3924]

∅:D[21.778] → [24.3883:3924]

∅:D[19.1487] → [24.3883:3924]

∅:D[22.16850] → [24.3883:3924]

∅:D[11.91117] → [24.3883:3924]

∅:D[2.116119] → [24.3883:3924]

B:BD[7.91548] → [24.3883:3924]

B:BD[24.3924] → [11.91118:91445]

B:BD[11.91488] → [11.91488:91511]

B:BD[11.91511] → [2.116120:116156]

∅:D[2.116156] → [11.91555:91709]

B:BD[11.91555] → [11.91555:91709]

B:BD[11.91709] → [2.116157:116185]

∅:D[2.116185] → [11.91770:91832]

B:BD[11.91770] → [11.91770:91832]

B:BD[11.91913] → [11.91913:91952]

B:BD[11.91952] → [2.116187:116187]

B:BD[7.84027] → [5.48:128]

BD:BD[7.84027] → [5.48:128]

B:BD[25.1129] → [5.129:205]

BD:BD[25.1129] → [5.129:205]

B:BD[8.419] → [5.206:254]

BD:BD[8.419] → [5.206:254]

B:BD[7.87493] → [5.255:412]

BD:BD[7.87493] → [5.255:412]

      -- render fragment
      local frag_width = App.width(f)
      if x + frag_width > State.right then
        assert(x > State.left)  -- no overfull lines
        y = y + State.line_height
        if y + State.line_height > App.screen.height then
          return y, screen_line_starting_pos
        end
        screen_line_starting_pos = pos
        x = State.left
      end
      if State.selection1.line then
        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
        Text.draw_highlight(State, line, x,y, pos, lo,hi)
      end
      -- Make [[WikiWords]] (single word, all in one screen line) clickable.
      local trimmed_word = rtrim(f)  -- compute_fragments puts whitespace at the end
      if starts_with(trimmed_word, '[[') and ends_with(trimmed_word, ']]') then
        local filename = trimmed_word:gsub('^..(.*)..$', '%1')
        if source.link_exists(State, filename) then
          button(State, 'link', {x=x+App.width('[['), y=y, w=App.width(filename), h=State.line_height, color={1,1,1},
            icon = icon.hyperlink_decoration,
            onpress1 = function()
                         source.switch_to_file(filename)
                        end,
          })
        end
      end
      App.screen.print(f, x,y)
      -- render cursor if necessary
      if line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len > State.cursor1.pos then
          if State.search_term then
            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then
              local lo_px = Text.draw_highlight(State, line, x,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
              App.color(Text_color)
              love.graphics.print(State.search_term, x+lo_px,y)
            end
          elseif Focus == 'edit' then
            Text.draw_cursor(State, x+Text.x(f, State.cursor1.pos-pos+1), y)
            App.color(Text_color)
          end
        end
      end
      x = x + frag_width
    end
    pos = pos + frag_len
  end
  if Focus == 'edit' and not hide_cursor and State.search_term == nil then
    if line_index == State.cursor1.line and State.cursor1.pos == pos then
      Text.draw_cursor(State, x, y)
    end
  end
  return y, screen_line_starting_pos
end
function Text.draw_cursor(State, x, y)
  -- blink every 0.5s
  if math.floor(Cursor_time*2)%2 == 0 then
    App.color(Cursor_color)
    love.graphics.rectangle('fill', x,y, 3,State.line_height)
  end
  State.cursor_x = x
  State.cursor_y = y+State.line_height
end
function Text.populate_screen_line_starting_pos(State, line_index)
  local line = State.lines[line_index]
  if line.mode ~= 'text' then return end
  local line_cache = State.line_cache[line_index]
  if line_cache.screen_line_starting_pos then
    return
  end
  -- duplicate some logic from Text.draw
  Text.compute_fragments(State, line_index)
  line_cache.screen_line_starting_pos = {1}
  local x = State.left
  local pos = 1
  for _, f in ipairs(line_cache.fragments) do
    -- render fragment
    local frag_width = App.width(f)
    if x + frag_width > State.right then
      x = State.left
      table.insert(line_cache.screen_line_starting_pos, pos)
    end
    x = x + frag_width
    pos = pos + utf8.len(f)
  end
end
function Text.compute_fragments(State, line_index)
  local line = State.lines[line_index]
-- return y for the next line, and position of start of final screen line drawn
  local final_screen_line_starting_pos = startpos  -- track value to return
  Text.populate_link_offsets(State, line_index)
  assert(#line_cache.screen_line_starting_pos >= 1)
  for i=1,#line_cache.screen_line_starting_pos do
    local pos = line_cache.screen_line_starting_pos[i]

Resurrecting zombie bytes in source_text.lua at line 23 [7.83786]

B:B[7.87831] → [5.413:1233]

BD:B[7.87831] → [5.413:1233]

B:B[26.20777] → [5.1234:1259]

BD:B[26.20777] → [5.1234:1259]

B:B[26.20894] → [5.1260:1327]

BD:B[26.20894] → [5.1260:1327]

B:B[7.88252] → [5.1328:1390]

BD:B[7.88252] → [5.1328:1390]

B:B[7.88326] → [5.1391:1539]

BD:B[7.88326] → [5.1391:1539]

B:B[7.88661] → [5.1540:1686]

BD:B[7.88661] → [5.1540:1686]

B:B[7.88834] → [5.1687:1760]

BD:B[7.88834] → [5.1687:1760]

B:B[7.88952] → [5.1761:1847]

BD:B[7.88952] → [5.1761:1847]

B:B[7.89102] → [5.1848:1941]

BD:B[7.89102] → [5.1848:1941]

B:B[7.89166] → [5.1942:2220]

BD:B[7.89166] → [5.1942:2220]

B:B[7.91121] → [5.2221:2376]

BD:B[7.91121] → [5.2221:2376]

B:B[7.91790] → [5.2377:2391]

BD:B[7.91790] → [5.2377:2391]

B:B[7.91829] → [5.2392:3264]

BD:B[7.91829] → [5.2392:3264]

B:B[7.92108] → [5.3265:3297]

BD:B[7.92108] → [5.3265:3297]

B:B[7.92139] → [5.3298:3329]

BD:B[7.92139] → [5.3298:3329]

B:B[7.92211] → [5.3330:3385]

BD:B[7.92211] → [5.3330:3385]

      final_screen_line_starting_pos = pos
      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)
      -- 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,
          })
      -- render fragment
        Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
      select_color(f)
      App.screen.print(f, State.left,y)
      if not hide_cursor and line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
              love.graphics.print(State.search_term, State.left+lo_px,y)
            Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y)
      y = y + State.line_height
      if y >= App.screen.height then
        break
      end
  return y, final_screen_line_starting_pos
end
function Text.screen_line(line, line_cache, i)
  local pos = line_cache.screen_line_starting_pos[i]
  local offset = Text.offset(line.data, pos)
  if i >= #line_cache.screen_line_starting_pos then
    return line.data:sub(offset)
  local endpos = line_cache.screen_line_starting_pos[i+1]-1
  local end_offset = Text.offset(line.data, endpos)
  return line.data:sub(offset, end_offset)
  local x = 0
  -- try to wrap at word boundaries
  for frag in line.data:gmatch('%S*%s*') do
    local frag_width = App.width(frag)
--?     print('-- frag:', frag, pos, x, frag_width, State.width)
    while x + frag_width > State.width do
--?       print('frag:', frag, pos, x, frag_width, State.width)
      if x < 0.8 * State.width then
        -- long word; chop it at some letter
        -- We're not going to reimplement TeX here.
        local bpos = Text.nearest_pos_less_than(frag, State.width - x)
        -- everything works if bpos == 0, but is a little inefficient
        pos = pos + bpos
        local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos
        frag = string.sub(frag, boffset)
--?         if bpos > 0 then
--?           print('after chop:', frag)
--?         end
        frag_width = App.width(frag)
      end
--?       print('screen line:', pos)
      x = 0  -- new screen line
    pos = pos + utf8.len(frag)
function Text.populate_link_offsets(State, line_index)

Solving an order conflict in source_text.lua at line 23 [7.83786]
[11.87400]
[5.413]
Insertion in source_text.lua at line 40 [7.83786]
[5.1233]
[5.1234]
```
        end
      end
```

Insertion in source_text.lua at line 43 [7.83786]

[5.1259]

[5.1260]

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

Insertion in source_text.lua at line 46 [7.83786]
[5.1327]
[5.1328]
```
      end
```
Insertion in source_text.lua at line 49 [7.83786]
[5.1390]
[5.1391]
```
      -- render cursor if necessary
```

Insertion in source_text.lua at line 52 [7.83786]

[5.1539]

[5.1540]

          if State.search_term then
            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then

Insertion in source_text.lua at line 55 [7.83786]
[5.1686]
[5.1687]
```
              App.color(Text_color)
```

Insertion in source_text.lua at line 57 [7.83786]

[5.1760]

[5.1761]

            end
          elseif Focus == 'edit' then

Insertion in source_text.lua at line 60 [7.83786]
[5.1847]
[5.1848]
```
          end
        end
      end
```
Insertion in source_text.lua at line 67 [7.83786]
[5.1941]
[5.1942]
```
    end
  end
```
Insertion in source_text.lua at line 77 [7.83786]
[5.2220]
[5.2221]
```
  end
```

Insertion in source_text.lua at line 81 [7.83786]

[5.2376]

[5.2377]

end
function Text.draw_cursor(State, x, y)
  -- blink every 0.5s
  if math.floor(Cursor_time*2)%2 == 0 then
    App.color(Cursor_color)
    love.graphics.rectangle('fill', x,y, 3,State.line_height)
  end
  State.cursor_x = x
  State.cursor_y = y+State.line_height
end
function Text.populate_screen_line_starting_pos(State, line_index)
  local line = State.lines[line_index]
  if line.mode ~= 'text' then return end
  local line_cache = State.line_cache[line_index]
  if line_cache.screen_line_starting_pos then
    return
  end
  line_cache.screen_line_starting_pos = {1}

Insertion in source_text.lua at line 102 [7.83786]
[5.2391]
[5.2392]
```
  local pos = 1
```

Insertion in source_text.lua at line 123 [7.83786]

[5.3264]

[5.3265]

      table.insert(line_cache.screen_line_starting_pos, pos)

Insertion in source_text.lua at line 125 [7.83786]
[5.3297]
[5.3298]
```
    end
    x = x + frag_width
```
Insertion in source_text.lua at line 128 [7.83786]
[5.3329]
[5.3330]
```
  end
end
```
Insertion in source_text.lua at line 132 [7.83786]
[5.3385]
[24.3925]
```
  local line = State.lines[line_index]
```
Replacement in source_text.lua at line 135 [7.83786]
B:BD[11.92003] → [11.92003:92034]
```
  if line_cache.fragments then
```
[11.92003]
[11.92034]
```
  if line_cache.link_offsets then
```
Replacement in source_text.lua at line 138 [7.83786]
B:BD[11.92051] → [11.92051:92102]
```
  line_cache.fragments = {}
  local x = State.left
```
[11.92051]
[11.92102]
```
  line_cache.link_offsets = {}
  local pos = 1
```

Replacement in source_text.lua at line 141 [7.83786]

B:BD[11.92138] → [11.92138:92182]

B:BD[11.92182] → [2.116188:116227]

∅:D[2.116227] → [11.92408:92450]

B:BD[11.92408] → [11.92408:92450]

B:BD[11.92574] → [11.92574:92636]

B:BD[11.92667] → [11.92667:92835]

B:BD[11.92867] → [11.92867:93025]

B:BD[11.93120] → [11.93120:93173]

B:BD[11.93173] → [2.116228:116273]

∅:D[2.116273] → [11.93379:93426]

B:BD[11.93379] → [11.93379:93426]

B:BD[11.93426] → [2.116274:116324]

∅:D[2.116324] → [11.93500:93541]

B:BD[11.93500] → [11.93500:93541]

B:BD[11.93541] → [2.116325:116362]

∅:D[2.116362] → [11.93646:93720]

B:BD[11.93646] → [11.93646:93720]

B:BD[11.93720] → [2.116363:116410]

  for frag in line.data:gmatch('%S*%s*') do
    local frag_width = App.width(frag)
    while x + frag_width > State.right do
      if (x-State.left) < 0.8 * (State.right-State.left) then
        -- long word; chop it at some letter
        -- We're not going to reimplement TeX here.
        local bpos = Text.nearest_pos_less_than(frag, State.right - x)
        if bpos == 0 then break end  -- avoid infinite loop when window is too narrow
        local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos
        local frag1 = string.sub(frag, 1, boffset-1)
        local frag1_width = App.width(frag1)
        assert(x + frag1_width <= State.right)
        table.insert(line_cache.fragments, frag1)
        frag = string.sub(frag, boffset)
        frag_width = App.width(frag)
      end
      x = State.left  -- new line
    end
    if #frag > 0 then
      table.insert(line_cache.fragments, frag)

[11.92138]

[11.96696]

  local s, e = 1, 0
  while s <= #line.data do
    s, e = line.data:find('%[%[%S+%]%]', s)
    if s == nil then break end
    local word = line.data:sub(s+2, e-2)  -- strip out surrounding '[[..]]'
--?     print('wikiword:', s, e, word)
    table.insert(line_cache.link_offsets, {s, e, word})
    s = e + 1
  end
end
-- Intersect the filename between byte offsets s,e with the bounds of screen line i.
-- Return the left/right pixel coordinates of of the intersection,
-- or nil if it doesn't intersect with screen line i.
function Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)
  local spos = line_cache.screen_line_starting_pos[i]
  local soff = Text.offset(line.data, spos)
  if e < soff then
    return
  end
  local eoff
  if i < #line_cache.screen_line_starting_pos then
    local epos = line_cache.screen_line_starting_pos[i+1]
    eoff = Text.offset(line.data, epos)
    if s > eoff then
      return

Replacement in source_text.lua at line 168 [7.83786]

B:BD[11.96704] → [11.96704:96727]

    x = x + frag_width

[11.96704]

[11.96727]

  end
  local loff = math.max(s, soff)
  local hoff
  if eoff then
    hoff = math.min(e, eoff)
  else
    hoff = e

Insertion in source_text.lua at line 176 [7.83786]

[11.96733]

--?   print(s, e, soff, eoff, loff, hoff)
  return App.width(line.data:sub(1, loff-1)), App.width(line.data:sub(1, hoff))

Deletion in source_text.lua at line 247 [7.83786]

B:BD[11.101399] → [2.116412:116412]

B:BD[7.92432] → [5.3386:3420]

BD:BD[7.92432] → [5.3386:3420]

B:BD[7.92480] → [5.3421:3468]

BD:BD[7.92480] → [5.3421:3468]

B:BD[7.92567] → [5.3469:4395]

BD:BD[7.92567] → [5.3469:4395]

B:BD[7.95004] → [5.4396:4512]

BD:BD[7.95004] → [5.4396:4512]

B:BD[7.95094] → [5.4513:4635]

BD:BD[7.95094] → [5.4513:4635]

  if line_cache.link_offsets then
  line_cache.link_offsets = {}
  local pos = 1
  local s, e = 1, 0
  while s <= #line.data do
    s, e = line.data:find('%[%[%S+%]%]', s)
    if s == nil then break end
    local word = line.data:sub(s+2, e-2)  -- strip out surrounding '[[..]]'
--?     print('wikiword:', s, e, word)
    table.insert(line_cache.link_offsets, {s, e, word})
    s = e + 1
  end
end
-- Intersect the filename between byte offsets s,e with the bounds of screen line i.
-- Return the left/right pixel coordinates of of the intersection,
-- or nil if it doesn't intersect with screen line i.
function Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)
  local spos = line_cache.screen_line_starting_pos[i]
  local soff = Text.offset(line.data, spos)
  if e < soff then
    return
  end
  local eoff
  if i < #line_cache.screen_line_starting_pos then
    local epos = line_cache.screen_line_starting_pos[i+1]
    eoff = Text.offset(line.data, epos)
    if s > eoff then
      return
  end
  local loff = math.max(s, soff)
  local hoff
  if eoff then
    hoff = math.min(e, eoff)
  else
    hoff = e
--?   print(s, e, soff, eoff, loff, hoff)
  return App.width(line.data:sub(1, loff-1)), App.width(line.data:sub(1, hoff))

Solving an order conflict in source_text.lua at line 247 [7.83786]
[11.101399]
[24.3967]
Replacement in source_text.lua at line 1003 [7.83786]
B:BD[11.142361] → [11.142361:142374]
```
  App.draw()
```
[11.142361]
[11.142374]
```
  edit.draw(State)
```

Deletion in source_text.lua at line 1010 [7.83786]

B:BD[11.142715] → [21.779:1036]

end
function source.link_exists(State, filename)
  if State.link_cache == nil then
    State.link_cache = {}
  end
  if State.link_cache[filename] == nil then
    State.link_cache[filename] = file_exists(filename)
  end
  return State.link_cache[filename]

Deletion in source_text.lua at line 1018 [7.83786]
B:BD[11.142871] → [21.1037:1061]
```
  State.link_cache = {}
```
Deletion in source_text.lua at line 1021 [7.83786]
B:BD[11.142933] → [11.142933:142980]
```
  State.line_cache[line_index].fragments = nil
```
Insertion in source_text.lua at line 1022 [7.83786]
[11.143090]
[11.143153]
```
  State.line_cache[line_index].link_offsets = nil
```
Deletion in source_text.lua at line 1036 [7.83786]
B:BD[7.146159] → [5.4636:4655]
BD:BD[7.146159] → [5.4636:4655]
B:BD[7.146888] → [5.4656:4706]
BD:BD[7.146888] → [5.4656:4706]
```
  edit.draw(State)
  State.line_cache[line_index].link_offsets = nil
```
Deletion in source_edit.lua at line 187 [7.152503]
∅:D[28.368] → [24.19763:19795]
∅:D[25.8799] → [24.19763:19795]
B:BD[28.368] → [24.19763:19795]
B:BD[24.19763] → [24.19763:19795]
D:D[28.368] → [24.19763:19795]
D:D[25.8799] → [24.19763:19795]
BD:BD[24.19763] → [24.19763:19795]
```
      y = y + State.line_height
```

Resurrecting zombie bytes in source_edit.lua at line 187 [7.152503]

B:B[24.19795] → [24.19795:20061]

BD:B[24.19795] → [24.19795:20061]

--?       print('=> y', y)
    elseif line.mode == 'drawing' then
      y = y+Drawing_padding_top
      Drawing.draw(State, line_index, y)
      y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom
    else
      print(line.mode)
      assert(false)

Deletion in source_edit.lua at line 510 [7.152503]
B:BD[11.155380] → [11.155380:155398]
```
  Text_cache = {}
```

Deletion in source.lua at line 48 [29.5]

B:BD[29.316] → [29.316:408]

  -- a few text objects we can avoid recomputing unless the font changes
  Text_cache = {}

Deletion in run.lua at line 9 [7.178107]

B:BD[2.122990] → [2.122990:123082]

  -- a few text objects we can avoid recomputing unless the font changes
  Text_cache = {}

Replacement in log_browser.lua at line 120 [31.5]

B:BD[30.1834] → [30.1834:1898]

          y = Text.draw(State, line_index, y, --[[startpos]] 1)

[30.1834]

[30.1898]

          Text.draw(State, line_index, y, --[[startpos]] 1)

Deletion in edit.lua at line 118 [32.413]
B:BD[2.134042] → [2.134042:134072]
```
    y = y + State.line_height
```
Deletion in edit.lua at line 354 [32.413]
B:BD[2.142629] → [2.142629:142647]
```
  Text_cache = {}
```

Merge text.love

Dependencies

In channels

Change contents

File deletion: log_browser.lua, log_browser.lua

Deletion in undo.lua at line 61 [9.1]

Deletion in text.lua at line 1 [13.1]

Replacement in text.lua at line 5 [13.1]

Resurrecting zombie bytes in text.lua at line 51 [13.1]

Deletion in text.lua at line 53 [13.1]

Resurrecting zombie bytes in text.lua at line 53 [13.1]

Solving an order conflict in text.lua at line 53 [13.1]

Resurrecting zombie bytes in text.lua at line 54 [13.1]

Deletion in text.lua at line 72 [13.1]

Replacement in text.lua at line 862 [13.1]

Deletion in text.lua at line 918 [13.1]

Solving an order conflict in text.lua at line 918 [13.1]

Replacement in source_text_tests.lua at line 980 [7.3561]

Deletion in source_text_tests.lua at line 2035 [7.3561]

Solving an order conflict in source_text_tests.lua at line 2035 [7.3561]

Replacement in source_text.lua at line 5 [7.83786]

Replacement in source_text.lua at line 12 [7.83786]

Replacement in source_text.lua at line 14 [7.83786]

Replacement in source_text.lua at line 16 [7.83786]

Deletion in source_text.lua at line 23 [7.83786]

Resurrecting zombie bytes in source_text.lua at line 23 [7.83786]

Solving an order conflict in source_text.lua at line 23 [7.83786]

Insertion in source_text.lua at line 40 [7.83786]

Insertion in source_text.lua at line 43 [7.83786]

Insertion in source_text.lua at line 46 [7.83786]

Insertion in source_text.lua at line 49 [7.83786]

Insertion in source_text.lua at line 52 [7.83786]

Insertion in source_text.lua at line 55 [7.83786]

Insertion in source_text.lua at line 57 [7.83786]

Insertion in source_text.lua at line 60 [7.83786]

Insertion in source_text.lua at line 67 [7.83786]

Insertion in source_text.lua at line 77 [7.83786]

Insertion in source_text.lua at line 81 [7.83786]

Insertion in source_text.lua at line 102 [7.83786]

Insertion in source_text.lua at line 123 [7.83786]

Insertion in source_text.lua at line 125 [7.83786]

Insertion in source_text.lua at line 128 [7.83786]

Insertion in source_text.lua at line 132 [7.83786]

Replacement in source_text.lua at line 135 [7.83786]

Replacement in source_text.lua at line 138 [7.83786]

Replacement in source_text.lua at line 141 [7.83786]

Replacement in source_text.lua at line 168 [7.83786]

Insertion in source_text.lua at line 176 [7.83786]

Deletion in source_text.lua at line 247 [7.83786]

Solving an order conflict in source_text.lua at line 247 [7.83786]

Replacement in source_text.lua at line 1003 [7.83786]

Deletion in source_text.lua at line 1010 [7.83786]

Deletion in source_text.lua at line 1018 [7.83786]

Deletion in source_text.lua at line 1021 [7.83786]

Insertion in source_text.lua at line 1022 [7.83786]

Deletion in source_text.lua at line 1036 [7.83786]

Deletion in source_edit.lua at line 187 [7.152503]

Resurrecting zombie bytes in source_edit.lua at line 187 [7.152503]

Deletion in source_edit.lua at line 510 [7.152503]

Deletion in source.lua at line 48 [29.5]

Deletion in run.lua at line 9 [7.178107]

Replacement in log_browser.lua at line 120 [31.5]

Deletion in edit.lua at line 118 [32.413]

Deletion in edit.lua at line 354 [32.413]