akkartik/driver.love - Change KWIVKQQ7AANRG6R4ZRB5TDBZ2TZTXAXIR2P6JNT362KIAJ7JQ4VQC

Merge lines.love

Created by Kartik K. Agaram on April 3, 2023

KWIVKQQ7AANRG6R4ZRB5TDBZ2TZTXAXIR2P6JNT362KIAJ7JQ4VQC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua
BFD:BFD[6.2] → [7.83676:83721]
BFD:BFD[6.2] → [7.83676:83721]
BFD:BFD[7.83721] → [7.3498:3498]
B:BD[7.35876] → [5.6:46]
∅:D[5.46] → [7.35980:36025]
```
  App.screen.check(y, 'mn', 'screen:3')
end
function test_pagedown_never_moves_up()
```

File deletion: source_text.lua, source_text.lua

BFD:BFD[6.2] → [7.147062:147101]

BFD:BFD[7.147101] → [7.83723:83723]

B:BD[7.146825] → [5.4656:4706]

∅:D[5.4706] → [7.146888:147057]

B:BD[7.146096] → [5.4636:4655]

∅:D[5.4655] → [7.146109:146455]

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

∅:D[5.4635] → [7.94273:94278]

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

∅:D[5.4512] → [7.94267:94273]

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

∅:D[5.4395] → [7.94236:94244]

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

∅:D[5.3468] → [7.92468:92504]

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

∅:D[5.3420] → [7.92400:92417]

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

∅:D[5.3385] → [7.92280:92319]

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

∅:D[5.3329] → [7.92137:92148]

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

∅:D[5.3297] → [7.92045:92076]

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

∅:D[5.3264] → [7.91984:92045]

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

∅:D[5.2391] → [7.91750:91766]

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

∅:D[5.2376] → [7.91109:91485]

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

∅:D[5.2220] → [7.91052:91058]

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

∅:D[5.1941] → [7.89064:89072]

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

∅:D[5.1847] → [7.89003:89039]

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

∅:D[5.1760] → [7.88835:88889]

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

∅:D[5.1686] → [7.88735:88771]

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

∅:D[5.1539] → [7.88412:88598]

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

∅:D[5.1390] → [7.88227:88263]

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

∅:D[5.1327] → [7.88179:88189]

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

∅:D[5.1259] → [8.20777:20894]

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

∅:D[5.1233] → [7.88105:88117]

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

∅:D[5.412] → [7.87674:87725]

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

∅:D[5.254] → [7.87409:87430]

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

∅:D[5.205] → [9.68:128]

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

∅:D[5.128] → [10.79:143]

  State.line_cache[line_index].link_offsets = nil
end
function trim(s)
  return s:gsub('^%s+', ''):gsub('%s+$', '')
end
function ltrim(s)
  return s:gsub('^%s+', '')
end
function rtrim(s)
  return s:gsub('%s+$', '')
  edit.draw(State)
  return State.cursor_y == nil
  -- this approach is cheaper and almost works, except on the final screen
  -- where file ends above bottom of screen
--?   local botpos = Text.pos_at_start_of_screen_line(State, State.cursor1)
--?   local botline1 = {line=State.cursor1.line, pos=botpos}
--?   return Text.lt1(State.screen_bottom1, botline1)
end
--?   print(s, e, soff, eoff, loff, hoff)
  return App.width(line.data:sub(1, loff-1)), App.width(line.data:sub(1, hoff))
end
  end
  local loff = math.max(s, soff)
  local hoff
  if eoff then
    hoff = math.min(e, eoff)
  else
    hoff = e
  end
  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
  line_cache.link_offsets = {}
  local pos = 1
  -- try to wrap at word boundaries
  if line_cache.link_offsets then
    return
  end
function Text.populate_link_offsets(State, line_index)
  local line = State.lines[line_index]
    pos = pos + utf8.len(frag)
  end
end
      x = 0  -- new screen line
    end
    x = x + frag_width
  -- 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)
      table.insert(line_cache.screen_line_starting_pos, pos)
  local x = 0
  local pos = 1
  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)
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]
  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)
  end
      y = y + State.line_height
      if y >= App.screen.height then
        break
      end
    end
            Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y)
          end
        end
      end
              love.graphics.print(State.search_term, State.left+lo_px,y)
            end
          elseif Focus == 'edit' 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)
      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
            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then
      select_color(f)
      App.screen.print(f, State.left,y)
      -- render cursor if necessary
        Text.draw_highlight(State, line, State.left,y, pos, lo,hi)
      end
      -- render fragment
      if State.selection1.line then
        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len)
      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,
          })
        end
  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]
    if pos < startpos then
      -- render nothing
  Text.populate_link_offsets(State, line_index)
  initialize_color()
  local final_screen_line_starting_pos = startpos  -- track value to return
  Text.populate_screen_line_starting_pos(State, line_index)
-- return y for the next line, and position of start of final screen line drawn
function Text.draw(State, line_index, y, startpos, hide_cursor)

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[6.2] → [7.203223:203262]

BFD:BFD[7.203262] → [7.191782:191782]

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

∅:D[5.4778] → [7.196638:197661]

          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

Replacement in source_text_tests.lua at line 980 [11.3561]
B:BD[11.35939] → [12.8363:8405]
```
  App.screen.check(y, 'mno ', 'screen:3')
```
[11.35939]
[11.36043]
```
  App.screen.check(y, 'mn', 'screen:3')
```

Replacement in source_text.lua at line 5 [11.83786]

B:BD[11.84027] → [13.971:1043]

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

[11.84027]

[13.1043]

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

Replacement in source_text.lua at line 12 [11.83786]
B:BD[13.1129] → [13.1129:1168]
∅:D[13.1168] → [11.87368:87412]
B:BD[11.87368] → [11.87368:87412]
```
  local x = State.left
  local pos = 1
  local screen_line_starting_pos = startpos
```
[13.1129]
[4.359]
```
  local final_screen_line_starting_pos = startpos  -- track value to return
```
Replacement in source_text.lua at line 14 [11.83786]
∅:D[4.419] → [11.87456:87472]
B:BD[11.87456] → [11.87456:87472]
```
  local pos = 1
```
[4.419]
[11.87472]
```
  Text.populate_link_offsets(State, line_index)
```

Replacement in source_text.lua at line 16 [11.83786]

B:BD[11.87493] → [11.87493:87565]

B:BD[11.87565] → [4.420:540]

  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.87493]

[11.87737]

  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]

Replacement in source_text.lua at line 23 [11.83786]

B:BD[11.87831] → [11.87831:87856]

B:BD[11.87856] → [4.573:611]

∅:D[4.611] → [11.87902:88090]

B:BD[11.87902] → [11.87902:88090]

B:BD[11.88090] → [13.1169:1214]

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

[11.87831]

[11.88168]

      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,
          })

Deletion in source_text.lua at line 41 [11.83786]
B:BD[11.88180] → [11.88180:88242]
```
        screen_line_starting_pos = pos
        x = State.left
```
Insertion in source_text.lua at line 42 [11.83786]
[14.20777]
[14.20777]
```
      -- render fragment
```

Replacement in source_text.lua at line 45 [11.83786]

B:BD[14.20894] → [14.20894:20952]

        Text.draw_highlight(State, line, x,y, pos, lo,hi)

[14.20894]

[11.88242]

        Text.draw_highlight(State, line, State.left,y, pos, lo,hi)

Replacement in source_text.lua at line 47 [11.83786]

B:BD[11.88252] → [15.7:84]

B:BD[15.84] → [4.612:697]

∅:D[4.697] → [15.172:367]

B:BD[15.172] → [15.172:367]

B:BD[15.367] → [4.698:816]

∅:D[4.816] → [15.578:779]

B:BD[15.578] → [15.578:779]

B:BD[15.779] → [4.817:848]

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

[11.88252]

[11.88290]

      select_color(f)
      App.screen.print(f, State.left,y)

Replacement in source_text.lua at line 50 [11.83786]

B:BD[11.88326] → [13.1215:1262]

∅:D[13.1262] → [11.88395:88475]

B:BD[11.88395] → [11.88395:88475]

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

[11.88326]

[11.88475]

      if not hide_cursor and line_index == State.cursor1.line then
        if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then

Replacement in source_text.lua at line 54 [11.83786]

B:BD[11.88661] → [11.88661:88798]

              local lo_px = Text.draw_highlight(State, line, x,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

[11.88661]

[11.88798]

              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

Replacement in source_text.lua at line 56 [11.83786]

B:BD[11.88834] → [11.88834:88898]

              love.graphics.print(State.search_term, x+lo_px,y)

[11.88834]

[11.88898]

              love.graphics.print(State.search_term, State.left+lo_px,y)

Replacement in source_text.lua at line 59 [11.83786]

B:BD[11.88952] → [4.849:926]

∅:D[4.926] → [11.89032:89066]

B:BD[11.89032] → [11.89032:89066]

            Text.draw_cursor(State, x+Text.x(f, State.cursor1.pos-pos+1), y)
            App.color(Text_color)

[11.88952]

[11.89066]

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

Replacement in source_text.lua at line 63 [11.83786]

B:BD[11.89102] → [11.89102:89127]

      x = x + frag_width

[11.89102]

[11.89127]

      y = y + State.line_height
      if y >= App.screen.height then
        break
      end

Deletion in source_text.lua at line 68 [11.83786]
B:BD[11.89135] → [11.89135:89160]
```
    pos = pos + frag_len
```

Replacement in source_text.lua at line 69 [11.83786]

B:BD[11.89166] → [13.1263:1448]

∅:D[13.1448] → [11.91082:91090]

B:BD[11.91082] → [11.91082:91090]

  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

[11.89166]

[11.91115]

  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)

Replacement in source_text.lua at line 78 [11.83786]

B:BD[11.91121] → [13.1449:1486]

  return y, screen_line_starting_pos

[11.91121]

[11.91172]

  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)

Deletion in source_text.lua at line 100 [11.83786]

B:BD[11.91661] → [11.91661:91746]

  -- duplicate some logic from Text.draw
  Text.compute_fragments(State, line_index)

Replacement in source_text.lua at line 101 [11.83786]
B:BD[11.91790] → [11.91790:91813]
```
  local x = State.left
```
[11.91790]
[11.91813]
```
  local x = 0
```

Replacement in source_text.lua at line 103 [11.83786]

B:BD[11.91829] → [11.91829:91875]

B:BD[11.91918] → [11.91918:91941]

B:BD[11.91941] → [4.927:963]

∅:D[4.963] → [11.91985:92047]

B:BD[11.91985] → [11.91985:92047]

  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

[11.91829]

[11.92047]

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

Insertion in source_text.lua at line 124 [11.83786]
[11.92108]
[11.92108]
```
      x = 0  -- new screen line
```
Replacement in source_text.lua at line 127 [11.83786]
B:BD[11.92139] → [4.964:992]
```
    pos = pos + utf8.len(f)
```
[11.92139]
[11.92200]
```
    pos = pos + utf8.len(frag)
```
Replacement in source_text.lua at line 131 [11.83786]
B:BD[11.92211] → [11.92211:92262]
```
function Text.compute_fragments(State, line_index)
```
[11.92211]
[11.92343]
```
function Text.populate_link_offsets(State, line_index)
```
Replacement in source_text.lua at line 135 [11.83786]
B:BD[11.92432] → [11.92432:92463]
```
  if line_cache.fragments then
```
[11.92432]
[11.92463]
```
  if line_cache.link_offsets then
```
Replacement in source_text.lua at line 138 [11.83786]
B:BD[11.92480] → [11.92480:92531]
```
  line_cache.fragments = {}
  local x = State.left
```
[11.92480]
[11.92531]
```
  line_cache.link_offsets = {}
  local pos = 1
```

Replacement in source_text.lua at line 141 [11.83786]

B:BD[11.92567] → [11.92567:92611]

B:BD[11.92611] → [4.993:1032]

∅:D[4.1032] → [11.92837:92879]

B:BD[11.92837] → [11.92837:92879]

B:BD[11.93003] → [11.93003:93065]

B:BD[11.93096] → [11.93096:93264]

B:BD[11.93296] → [11.93296:93454]

B:BD[11.93549] → [11.93549:93602]

B:BD[11.93602] → [4.1033:1078]

∅:D[4.1078] → [11.93808:93855]

B:BD[11.93808] → [11.93808:93855]

B:BD[11.93855] → [4.1079:1129]

∅:D[4.1129] → [11.93929:93970]

B:BD[11.93929] → [11.93929:93970]

B:BD[11.93970] → [4.1130:1167]

∅:D[4.1167] → [11.94075:94149]

B:BD[11.94075] → [11.94075:94149]

B:BD[11.94149] → [4.1168:1215]

  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.92567]

[11.94996]

  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 [11.83786]

B:BD[11.95004] → [11.95004:95027]

    x = x + frag_width

[11.95004]

[11.95088]

  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 [11.83786]

[11.95094]

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

Replacement in source_text.lua at line 1003 [11.83786]
B:BD[11.146159] → [11.146159:146172]
```
  App.draw()
```
[11.146159]
[11.146172]
```
  edit.draw(State)
```

Deletion in source_text.lua at line 1012 [11.83786]

B:BD[11.146518] → [15.780:1037]

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

Deletion in source_text.lua at line 1018 [11.83786]
B:BD[11.146669] → [15.1038:1062]
```
  State.link_cache = {}
```
Deletion in source_text.lua at line 1021 [11.83786]
B:BD[11.146731] → [11.146731:146778]
```
  State.line_cache[line_index].fragments = nil
```
Insertion in source_text.lua at line 1022 [11.83786]
[11.146888]
[11.146951]
```
  State.line_cache[line_index].link_offsets = nil
```
Deletion in source_edit.lua at line 187 [11.152503]
∅:D[16.368] → [17.19763:19795]
∅:D[13.8799] → [17.19763:19795]
B:BD[17.19763] → [17.19763:19795]
```
      y = y + State.line_height
```
Deletion in source_edit.lua at line 510 [11.152503]
B:BD[11.164233] → [11.164233:164251]
```
  Text_cache = {}
```

Deletion in source.lua at line 53 [11.165829]

B:BD[11.166636] → [11.166636:166728]

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

Deletion in run.lua at line 9 [11.178107]

B:BD[11.178259] → [11.178259:178351]

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

Replacement in log_browser.lua at line 120 [11.191243]

B:BD[11.196035] → [11.196035:196099]

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

[11.196035]

[11.196099]

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

Deletion in edit.lua at line 118 [19.413]
B:BD[18.9735] → [18.9735:9765]
```
    y = y + State.line_height
```

Merge lines.love

Dependencies

In channels

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

File deletion: source_text.lua, source_text.lua

File deletion: log_browser.lua, log_browser.lua

Replacement in source_text_tests.lua at line 980 [11.3561]

Replacement in source_text.lua at line 5 [11.83786]

Replacement in source_text.lua at line 12 [11.83786]

Replacement in source_text.lua at line 14 [11.83786]

Replacement in source_text.lua at line 16 [11.83786]

Replacement in source_text.lua at line 23 [11.83786]

Deletion in source_text.lua at line 41 [11.83786]

Insertion in source_text.lua at line 42 [11.83786]

Replacement in source_text.lua at line 45 [11.83786]

Replacement in source_text.lua at line 47 [11.83786]

Replacement in source_text.lua at line 50 [11.83786]

Replacement in source_text.lua at line 54 [11.83786]

Replacement in source_text.lua at line 56 [11.83786]

Replacement in source_text.lua at line 59 [11.83786]

Replacement in source_text.lua at line 63 [11.83786]

Deletion in source_text.lua at line 68 [11.83786]

Replacement in source_text.lua at line 69 [11.83786]

Replacement in source_text.lua at line 78 [11.83786]

Deletion in source_text.lua at line 100 [11.83786]

Replacement in source_text.lua at line 101 [11.83786]

Replacement in source_text.lua at line 103 [11.83786]

Insertion in source_text.lua at line 124 [11.83786]

Replacement in source_text.lua at line 127 [11.83786]

Replacement in source_text.lua at line 131 [11.83786]

Replacement in source_text.lua at line 135 [11.83786]

Replacement in source_text.lua at line 138 [11.83786]

Replacement in source_text.lua at line 141 [11.83786]

Replacement in source_text.lua at line 168 [11.83786]

Insertion in source_text.lua at line 176 [11.83786]

Replacement in source_text.lua at line 1003 [11.83786]

Deletion in source_text.lua at line 1012 [11.83786]

Deletion in source_text.lua at line 1018 [11.83786]

Deletion in source_text.lua at line 1021 [11.83786]

Insertion in source_text.lua at line 1022 [11.83786]

Deletion in source_edit.lua at line 187 [11.152503]

Deletion in source_edit.lua at line 510 [11.152503]

Deletion in source.lua at line 53 [11.165829]

Deletion in run.lua at line 9 [11.178107]

Replacement in log_browser.lua at line 120 [11.191243]

Deletion in edit.lua at line 118 [19.413]