akkartik/techmeet.love - Change LEP7X3CT5H7NRQOBIAKQU32QLQQWLBURBNTR2YZUYL53C5BRAM6QC

Merge lines.love

This was complicated. I had to:

make a couple of tests pending that I discovere were only accidentally passing for a while. I'll fix those outside the merge commit.
copy over the implementation of links from the lines-and-links fork

Created by Kartik K. Agaram on April 2, 2023

LEP7X3CT5H7NRQOBIAKQU32QLQQWLBURBNTR2YZUYL53C5BRAM6QC

Dependencies

In channels

main

Change contents

File deletion: commands.lua, commands.lua

BFD:BFD[10.2] → [11.207726:207762]

BFD:BFD[11.207762] → [11.204370:204370]

B:BD[12.1363] → [13.1297:1335]

∅:D[13.1335] → [12.1410:1506]

B:BD[12.863] → [13.1258:1296]

∅:D[13.1296] → [12.910:1363]

B:BD[14.1984] → [13.1202:1257]

∅:D[13.1257] → [14.2043:2101]

B:BD[14.1526] → [13.1169:1201]

∅:D[13.1201] → [14.1607:1984]

B:BD[14.972] → [13.1136:1168]

∅:D[13.1168] → [14.1053:1231]

B:BD[11.207023] → [13.1108:1135]

∅:D[13.1135] → [15.1023:1057]

B:BD[15.808] → [13.1078:1107]

∅:D[13.1107] → [15.809:905]

B:BD[14.404] → [13.1039:1077]

∅:D[13.1077] → [16.76:207]

B:BD[17.227] → [13.933:1038]

∅:D[13.1038] → [15.29:72]

B:BD[11.206145] → [13.895:932]

∅:D[13.932] → [11.206193:206277]

B:BD[11.205905] → [13.865:894]

∅:D[13.894] → [18.29:75]

    local width = App.width(filename)
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    local width = App.width(filename)
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    end
    if i == index then
    return y, x, width
    end
    x = x + width + 30
  end
end
function file_index(fy, fx, fwidth)
  log_start('file index')
  log(2, ('for %d %d %d'):format(fy, fx, fwidth))
  local y,x = Menu_status_bar_height, 5
  local best_guess, best_guess_x, best_guess_width
  for i,filename in ipairs(File_navigation.candidates) do
      App.screen.print(filename, x + x3-menu_xmin, y3)
    end
    x3 = x3 + width + 30
  end
  --
  return h+20
    width = App.width(filename)
    if x3 + width > App.screen.width - 5 then
      y3 = y3 + Editor_state.line_height
      x3 = 0
    end
    if i == o.index then
      App.color(Menu_highlight_color)
      love.graphics.rectangle('fill', x + x3-menu_xmin - 5, y3-2, width+5*2, Editor_state.line_height+2*2)
    end
    if x3 >= menu_xmin and x3 + width < menu_xmax then
      App.color(Menu_command_color)
    width = App.width(filename)
    if x2 + width > App.screen.width - 5 then
      y2 = y2 + Editor_state.line_height
      x2 = 0
    end
    if i == o.index then
      break
    end
    x2 = x2 + width + 30
  App.screen.print(s, x,y)
  x = x + width + 30
  return x,y
  local width = App.width(s)
  if x + width > App.screen.width - 5 then
    y = y + Editor_state.line_height
    x = 5
  end
    local width = App.width(filename)
    if x + width > App.screen.width - 5 then
      result = result+1
      x = 5 + width
    else
      x = x + width + 30
    end
  App.screen.print(File_navigation.filter, 5, 5)
  draw_cursor(5 + App.width(File_navigation.filter), 5)
  if File_navigation.num_lines == nil then
  App.screen.print(s, Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30
end
function source.draw_file_navigator()
  local width = App.width(s)
  if Menu_cursor > App.screen.width - 30 then

Replacement in text_tests.lua at line 1604 [20.2]

B:BD[19.1488] → [19.1488:1545]

function test_right_arrow_scrolls_down_in_wrapped_line()

[19.1488]

[19.1607]

function pending_test_right_arrow_scrolls_down_in_wrapped_line()

Replacement in text_tests.lua at line 1663 [20.2]

B:BD[21.1489] → [19.4490:4539]

function test_end_scrolls_down_in_wrapped_line()

[21.1489]

[19.4593]

function pending_test_end_scrolls_down_in_wrapped_line()

Deletion in text.lua at line 8 [23.1]
B:BD[22.214] → [9.44:84]
```
--?   print('text.draw', line_index, y)
```
Solving an order conflict in text.lua at line 8 [23.1]
[24.66]
[25.42]

Replacement in text.lua at line 15 [23.1]

B:BD[26.37] → [27.3:73]

BD:BD[26.37] → [27.3:73]

--?     print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)

[30.63]

[9.162]

  Text.populate_link_offsets(State, line_index)

Deletion in text.lua at line 21 [23.1]
B:BD[31.95] → [31.95:129]
BD:BD[31.95] → [31.95:129]
```
--?       print('skipping', frag)
```
Resurrecting zombie bytes in text.lua at line 22 [23.1]
∅:∅[32.135] → [31.129:138]
∅:∅[29.150] → [31.129:138]
B:B[31.129] → [31.129:138]
BD:B[31.129] → [31.129:138]
B:B[31.138] → [9.320:521]
BD:B[31.138] → [9.320:521]
```
    else
      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)
```

Deletion in text.lua at line 27 [23.1]

∅:D[9.521] → [33.3:28]

B:BD[31.138] → [33.3:28]

B:BD[33.28] → [33.28:74]

BD:BD[33.28] → [33.28:74]

∅:D[33.74] → [31.138:234]

B:BD[31.138] → [31.138:234]

D:D[34.46] → [31.138:234]

D:D[33.74] → [31.138:234]

D:D[32.174] → [31.138:234]

BD:BD[33.74] → [31.138:234]

BD:BD[31.138] → [31.138:234]

B:BD[31.258] → [35.3:321]

BD:BD[31.258] → [35.3:321]

B:BD[35.321] → [6.3:48]

∅:D[6.48] → [35.370:581]

B:BD[35.370] → [35.370:581]

BD:BD[35.370] → [35.370:581]

      -- render fragment
      local frag_width = App.width(frag_text)
      if x + frag_width > State.right then
        assert(x > State.left)  -- no overfull lines
      end
      -- Make [[WikiWords]] (single word, all in one screen line) clickable.
      local trimmed_word = rtrim(frag)  -- 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 link_exists(State, filename) then
          local filename_text = App.newText(love.graphics.getFont(), filename)
          button(State, 'link', {x=x+App.width(to_text('[[')), y=y, w=App.width(filename_text), h=State.line_height, color={1,1,1},

Resurrecting zombie bytes in text.lua at line 27 [23.1]
∅:∅[35.581] → [35.581:661]
B:B[35.581] → [35.581:661]
BD:B[35.581] → [35.581:661]
```
            icon = icon.hyperlink_decoration,
            onpress1 = function()
```

Insertion in text.lua at line 27 [23.1]

[9.521]

[35.581]

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

Replacement in text.lua at line 35 [23.1]

B:BD[35.661] → [35.661:758]

BD:BD[35.661] → [35.661:758]

                         command.open_file_in_next_column(filename)
                        end,

[35.661]

[35.758]

                         if file_exists(Directory..filename) then
                           command.open_file_in_next_column(filename)
                         end
                       end,

Insertion in text.lua at line 41 [23.1]
[35.783]
[36.629]
```
      end
      -- render fragment
```

Deletion in text.lua at line 47 [23.1]

B:BD[37.334] → [38.3:127]

BD:BD[37.334] → [38.3:127]

--?       love.graphics.line(0,y, 300,y)
--?       love.graphics.print(tostring(y+Display_settings.y-Header_height), 300,y)

Deletion in text.lua at line 108 [23.1]
B:BD[39.638] → [4.3:72]
BD:BD[39.638] → [4.3:72]
BD:BD[39.638] → [4.3:72]
```
--?     print('', '', frag, 'comparing', x, frag_width, State.right)
```

Insertion in text.lua at line 136 [23.1]

[40.1568]

[41.1034]

function Text.populate_link_offsets(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.link_offsets then
    return
  end
  line_cache.link_offsets = {}
  local pos = 1
  -- try to wrap at word boundaries
  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
  end
  local loff = math.max(s, soff)
  local hoff
  if eoff then
    hoff = math.min(e, eoff)
  else
    hoff = e
  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

Replacement in text.lua at line 830 [23.1]

B:BD[42.608] → [42.608:722]

  local screen_line_text = App.newText(love.graphics.getFont(), screen_line)
  return App.width(screen_line_text)

[42.608]

[43.1644]

  return App.width(screen_line)

Deletion in text.lua at line 1042 [23.1]

B:BD[44.1161] → [6.49:310]

function 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(Directory..filename)
  end
  return State.link_cache[filename]
end

Deletion in text.lua at line 1048 [23.1]
B:BD[45.2916] → [6.311:335]
```
  State.link_cache = {}
```
Insertion in text.lua at line 1052 [23.1]
[46.1777]
[5.3]
```
  State.line_cache[line_index].link_offsets = nil
```
Replacement in source_commands.lua at line 46 [47.11]
B:BD[47.1546] → [48.12:74]
```
  local s_text = to_text(s)
  local width = App.width(s_text)
```
[47.1546]
[49.12]
```
  local width = App.width(s)
```
Replacement in source_commands.lua at line 51 [47.11]
B:BD[47.1786] → [48.75:116]
```
  App.screen.draw(s_text, Menu_cursor,5)
```
[47.1786]
[47.1834]
```
  App.screen.print(s, Menu_cursor,5)
```

Replacement in source_commands.lua at line 57 [47.11]

B:BD[48.149] → [48.149:285]

  local filter_text = to_text(File_navigation.filter)
  App.screen.draw(filter_text, 5, 5)
  draw_cursor(5 + App.width(filter_text), 5)

[48.149]

[48.285]

  App.screen.print(File_navigation.filter, 5, 5)
  draw_cursor(5 + App.width(File_navigation.filter), 5)

Replacement in source_commands.lua at line 98 [47.11]
B:BD[48.1566] → [48.1566:1613]
```
    local width = App.width(to_text(filename))
```
[48.1566]
[48.1613]
```
    local width = App.width(filename)
```
Replacement in source_commands.lua at line 110 [47.11]
B:BD[48.1823] → [48.1823:1885]
```
  local s_text = to_text(s)
  local width = App.width(s_text)
```
[48.1823]
[48.1885]
```
  local width = App.width(s)
```
Replacement in source_commands.lua at line 125 [47.11]
B:BD[47.2664] → [48.2326:2357]
```
  App.screen.draw(s_text, x,y)
```
[47.2664]
[48.2357]
```
  App.screen.print(s, x,y)
```

Replacement in source_commands.lua at line 189 [47.11]

B:BD[48.3677] → [48.3677:3758]

    local filename_text = to_text(filename)
    width = App.width(filename_text)

[48.3677]

[48.3758]

    width = App.width(filename)

Replacement in source_commands.lua at line 206 [47.11]

B:BD[48.4236] → [48.4236:4317]

    local filename_text = to_text(filename)
    width = App.width(filename_text)

[48.4236]

[48.4317]

    width = App.width(filename)

Replacement in source_commands.lua at line 217 [47.11]

B:BD[48.4694] → [48.4694:4753]

      App.screen.draw(filename_text, x + x3-menu_xmin, y3)

[48.4694]

[48.4753]

      App.screen.print(filename, x + x3-menu_xmin, y3)

Replacement in source_commands.lua at line 244 [47.11]
B:BD[48.5365] → [48.5365:5412]
```
    local width = App.width(to_text(filename))
```
[48.5365]
[48.5412]
```
    local width = App.width(filename)
```
Replacement in source_commands.lua at line 262 [47.11]
B:BD[48.5865] → [48.5865:5912]
```
    local width = App.width(to_text(filename))
```
[48.5865]
[48.5912]
```
    local width = App.width(filename)
```

Replacement in search.lua at line 17 [20.48846]

B:BD[20.49599] → [42.778:855]

BD:BD[20.49599] → [42.778:855]

  Text.draw_cursor(State, 25+App.width(State.search_text),y-5, force_cursor)

[36.1671]

[50.416]

  Text.draw_cursor(State, 25+App.width(State.search_term),y-5, force_cursor)

Deletion in search.lua at line 23 [20.48846]
B:BD[36.1671] → [34.899:962]
```
  Text.draw_cursor(State, 25+App.width(State.search_term),y-5)
```
Solving an order conflict in search.lua at line 23 [20.48846]
[50.528]
[20.49698]
Deletion in run.lua at line 76 [11.178044]
B:BD[47.6642] → [47.6642:6709]
```
    palette_command_text=App.newText(love.graphics.getFont(), ''),
```
Replacement in run.lua at line 77 [11.178044]
B:BD[47.6766] → [47.6766:6803]
```
    search_term='', search_text=nil,
```
[47.6766]
[47.6803]
```
    search_term='',
```

Replacement in run.lua at line 79 [11.178044]

B:BD[47.6880] → [47.6880:6955]

    search_all_query=nil, search_all_query_text=nil, search_all_terms=nil,

[47.6880]

[47.6955]

    search_all_query=nil, search_all_terms=nil,

Deletion in run.lua at line 113 [11.178044]
∅:D[47.8228] → [11.178196:178288]
B:BD[11.178196] → [11.178196:178288]
```
  -- a few text objects we can avoid recomputing unless the font changes
  Text_cache = {}
```
Deletion in run.lua at line 123 [11.178044]
B:BD[51.235] → [51.235:262]
```
  Current_error_text = nil
```
Deletion in run.lua at line 188 [11.178044]
B:BD[47.9613] → [47.9613:9662]
```
  Em = App.newText(love.graphics.getFont(), 'm')
```

Replacement in run.lua at line 201 [11.178044]

B:BD[47.10101] → [47.10101:10201]

  Em = App.newText(love.graphics.getFont(), 'm')
  Display_settings.column_width = 40*App.width(Em)

[47.10101]

[47.10201]

  Display_settings.column_width = 40*App.width('m')

Deletion in run.lua at line 204 [11.178044]
B:BD[11.180430] → [34.965:1014]
BD:BD[11.180430] → [34.965:1014]
```
  run.initialize_window_geometry(App.width('m'))
```
Solving an order conflict in run.lua at line 204 [11.178044]
[47.10276]
[11.180777]
Deletion in run.lua at line 244 [11.178044]
B:BD[47.11242] → [47.11242:11259]
```
  result.em = Em
```
Deletion in run.lua at line 268 [11.178044]
B:BD[47.11906] → [47.11906:11944]
```
      Text.compute_fragments(pane, i)
```

Replacement in run.lua at line 369 [11.178044]

B:BD[47.16251] → [47.16251:16368]

        pane.left = App.screen.width/2 - 20*App.width(Em)
        pane.right = App.screen.width/2 + 20*App.width(Em)

[47.16251]

[47.16368]

        pane.left = App.screen.width/2 - 20*App.width('m')
        pane.right = App.screen.width/2 + 20*App.width('m')

Deletion in run.lua at line 458 [11.178044]

B:BD[47.19707] → [47.19707:19831]

  if Text_cache[pane.title] == nil then
    Text_cache[pane.title] = App.newText(love.graphics.getFont(), pane.title)
  end

Replacement in run.lua at line 459 [11.178044]

B:BD[47.19861] → [47.19861:19952]

  App.screen.draw(Text_cache[pane.title], pane.left, pane.top-Margin_above -5-Line_height)

[47.19861]

[47.19952]

  App.screen.print(pane.title, pane.left, pane.top-Margin_above -5-Line_height)

Replacement in run.lua at line 473 [11.178044]

B:BD[47.20545] → [7.17:65]

    x = x + App.width(to_text(label)) + 10 + 10

[47.20545]

[47.20596]

    x = x + App.width(label) + 10 + 10

Replacement in run.lua at line 479 [11.178044]

B:BD[47.20866] → [7.66:115]

      x = x + App.width(to_text(link)) + 10 + 10

[47.20866]

[47.20918]

      x = x + App.width(link) + 10 + 10

Deletion in run.lua at line 486 [11.178044]
B:BD[47.21014] → [7.116:152]
```
  local label_text = to_text(label)
```
Replacement in run.lua at line 487 [11.178044]
B:BD[47.21043] → [7.153:194]
```
  love.graphics.draw(label_text, x, y+5)
```
[47.21043]
[47.21091]
```
  love.graphics.print(label, x, y+5)
```

Replacement in run.lua at line 489 [11.178044]

B:BD[47.21131] → [7.195:282]

  love.graphics.rectangle('fill', x-5, y+3, App.width(label_text)+10, 2+Line_height+2)

[47.21131]

[47.21225]

  love.graphics.rectangle('fill', x-5, y+3, App.width(label)+10, 2+Line_height+2)

Deletion in run.lua at line 545 [11.178044]
B:BD[51.512] → [51.512:543]
```
      Current_error_text = nil
```

Deletion in run.lua at line 746 [11.178044]

B:BD[47.26376] → [47.26376:26491]

    Display_settings.palette_command_text = App.newText(love.graphics.getFont(), Display_settings.palette_command)

Deletion in run.lua at line 778 [11.178044]
B:BD[47.27755] → [47.27755:27794]
```
    Display_settings.search_text = nil
```
Deletion in run.lua at line 790 [11.178044]
B:BD[47.28293] → [47.28293:28342]
```
    Display_settings.search_all_query_text = nil
```
Deletion in run.lua at line 792 [11.178044]
B:BD[47.28434] → [47.28434:28483]
```
    Display_settings.search_all_query_text = nil
```

Replacement in run.lua at line 880 [11.178044]

B:BD[47.30524] → [47.30524:30600]

  local column_width_in_ems = Display_settings.column_width / App.width(Em)

[47.30524]

[47.30600]

  local column_width_in_ems = Display_settings.column_width / App.width('m')

Replacement in run.lua at line 884 [11.178044]

B:BD[47.30732] → [47.30732:30849]

  Em = App.newText(love.graphics.getFont(), 'm')
  Display_settings.column_width = column_width_in_ems*App.width(Em)

[47.30732]

[47.30849]

  Display_settings.column_width = column_width_in_ems*App.width('m')

Deletion in run.lua at line 889 [11.178044]
B:BD[47.30996] → [47.30996:31015]
```
      pane.em = Em
```

Replacement in run.lua at line 902 [11.178044]

B:BD[47.31507] → [47.31507:31594]

--   we want the search_term and search_text to be set for at most a single
--   pane.

[47.31507]

[47.31594]

--   we want the search_term to be set for at most a single pane.

Deletion in run.lua at line 979 [11.178044]
B:BD[47.34508] → [47.34508:34558]
```
  pane.search_text = Display_settings.search_text
```
Deletion in run.lua at line 994 [11.178044]
B:BD[47.35109] → [47.35109:35134]
```
  pane.search_text = nil
```
Deletion in run.lua at line 1072 [11.178044]
B:BD[47.38311] → [47.38311:38361]
```
  pane.search_text = Display_settings.search_text
```
Deletion in run.lua at line 1087 [11.178044]
B:BD[47.38920] → [47.38920:38945]
```
  pane.search_text = nil
```

Replacement in run.lua at line 1115 [11.178044]

B:BD[47.39591] → [47.39591:39716]

  local vertically_ok = cursor_sx > Display_settings.x and cursor_sx < Display_settings.x + App.screen.width - App.width(Em)

[47.39591]

[47.40053]

  local vertically_ok = cursor_sx > Display_settings.x and cursor_sx < Display_settings.x + App.screen.width - App.width('m')

Deletion in run.lua at line 1149 [11.178044]
B:BD[47.42065] → [47.42065:42094]
```
      pane.search_text = nil
```
Deletion in run.lua at line 1255 [11.178044]
B:BD[47.47505] → [47.47505:47544]
```
    Display_settings.search_text = nil
```
Deletion in run.lua at line 1268 [11.178044]
B:BD[47.48108] → [47.48108:48147]
```
    Display_settings.search_text = nil
```
Deletion in run.lua at line 1325 [11.178044]
B:BD[47.50141] → [47.50141:50190]
```
    Display_settings.search_all_query_text = nil
```
Deletion in run.lua at line 1328 [11.178044]
B:BD[47.50403] → [47.50403:50452]
```
    Display_settings.search_all_query_text = nil
```
Deletion in run.lua at line 1573 [11.178044]
B:BD[47.58685] → [47.58685:58703]
```
  Text_cache = {}
```

Resurrecting zombie bytes in run.lua at line 1641 [11.178044]

B:B[11.184041] → [47.60426:60558]

BD:B[11.184041] → [47.60426:60558]

end
function num_panes()
  local result = 0
  for _,column in ipairs(Surface) do
    result = result+#column
  end
  return result

Insertion in run.lua at line 1641 [11.178044]

[11.183879]

[47.60426]

function width(s)
  return love.graphics.getFont():getWidth(s)

Deletion in run.lua at line 1651 [11.178044]
B:BD[11.183879] → [13.135:198]
```
function width(s)
  return love.graphics.getFont():getWidth(s)
```
Solving an order conflict in run.lua at line 1651 [11.178044]
[47.60558]
[11.184041]
Deletion in errors.lua at line 8 [51.652]
B:BD[51.859] → [51.859:924]
```
  Current_error_text = App.newText(love.graphics.getFont(), err)
```

Replacement in errors.lua at line 12 [51.652]

B:BD[51.996] → [51.996:1157]

  local left = math.max(0, 1/2*(App.screen.width-App.width(Current_error_text)-10))
  local width = math.min(App.screen.width, App.width(Current_error_text)+20)

[51.996]

[51.1157]

  local left = math.max(0, 1/2*(App.screen.width-App.width(Current_error)-10))
  local width = math.min(App.screen.width, App.width(Current_error)+20)

Replacement in errors.lua at line 17 [51.652]

B:BD[51.1302] → [51.1302:1378]

  love.graphics.draw(Current_error_text, left+10, Menu_status_bar_height+5)

[51.1302]

[51.1378]

  love.graphics.print(Current_error, left+10, Menu_status_bar_height+5)

Replacement in commands.lua at line 186 [53.39]

B:BD[52.2585] → [49.108:170]

  local s_text = to_text(s)
  local width = App.width(s_text)

[52.2585]

[49.170]

  local width = App.width(s)

Replacement in commands.lua at line 191 [53.39]
∅:D[54.976] → [55.262:310]
B:BD[52.2851] → [55.262:310]
```
  App.screen.draw(Text_cache[s], Menu_cursor,5)
```
[54.976]
[52.2904]
```
  App.screen.print(s, Menu_cursor,5)
```

Deletion in commands.lua at line 204 [53.39]

B:BD[56.600] → [56.600:715]

    Display_settings.palette_command_text = App.newText(love.graphics.getFont(), Display_settings.palette_command)

Deletion in commands.lua at line 210 [53.39]

B:BD[56.826] → [56.826:941]

    Display_settings.palette_command_text = App.newText(love.graphics.getFont(), Display_settings.palette_command)

Deletion in commands.lua at line 212 [53.39]

B:BD[56.1038] → [56.1038:1153]

    Display_settings.palette_command_text = App.newText(love.graphics.getFont(), Display_settings.palette_command)

Deletion in commands.lua at line 228 [53.39]

B:BD[56.1543] → [56.1543:1628]

    Display_settings.palette_command_text = App.newText(love.graphics.getFont(), '')

Deletion in commands.lua at line 292 [53.39]

B:BD[57.2665] → [58.831:1004]

∅:D[58.1004] → [57.2825:2831]

B:BD[57.2825] → [57.2825:2831]

  if Display_settings.search_all_query_text == nil then
    Display_settings.search_all_query_text = App.newText(love.graphics.getFont(), Display_settings.search_all_query)
  end

Replacement in commands.lua at line 294 [53.39]

B:BD[57.2859] → [58.1005:1071]

  love.graphics.draw(Display_settings.search_all_query_text, x,y)

[57.2859]

[57.2919]

  love.graphics.print(Display_settings.search_all_query, x,y)

Replacement in commands.lua at line 310 [53.39]
∅:D[59.223] → [55.311:402]
B:BD[52.3990] → [55.311:402]
∅:D[55.402] → [52.4091:4097]
B:BD[52.4091] → [52.4091:4097]
B:BD[52.4097] → [55.403:444]
```
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  local width = App.width(Text_cache[s])
```
[59.223]
[52.4143]
```
  local width = App.width(s)
```

Replacement in commands.lua at line 321 [53.39]

B:BD[60.66] → [55.445:514]

  App.screen.draw(Text_cache[s], Palette_cursor.x, Palette_cursor.y)

[60.66]

[52.4294]

  App.screen.print(s, Palette_cursor.x, Palette_cursor.y)

Replacement in commands.lua at line 333 [53.39]

B:BD[53.1747] → [56.2518:2640]

  love.graphics.draw(Display_settings.palette_command_text, x,y)
  x = x+App.width(Display_settings.palette_command_text)

[53.1747]

[53.1853]

  love.graphics.print(Display_settings.palette_command, x,y)
  x = x+App.width(Display_settings.palette_command)

Replacement in commands.lua at line 740 [53.39]

B:BD[61.478] → [61.478:560]

  Display_settings.column_width = Display_settings.column_width + 5*App.width(Em)

[61.478]

[24.397]

  Display_settings.column_width = Display_settings.column_width + 5*App.width('m')

Replacement in commands.lua at line 752 [53.39]

B:BD[61.612] → [61.612:694]

  Display_settings.column_width = Display_settings.column_width - 5*App.width(Em)

[61.612]

[24.554]

  Display_settings.column_width = Display_settings.column_width - 5*App.width('m')

Deletion in commands.lua at line 805 [53.39]
B:BD[51.2230] → [51.2230:2245]
```
  pane.em = Em
```
Deletion in commands.lua at line 849 [53.39]
B:BD[57.4527] → [57.4527:4544]
```
  result.em = Em
```

Resurrecting zombie bytes in app.lua at line 417 [64.2]

B:B[62.8162] → [63.1553:1660]

BD:B[62.8162] → [63.1553:1660]

  App.open_for_reading =
      function(filename)
        local result = love.filesystem.newFile(filename)

Resurrecting zombie bytes in app.lua at line 426 [64.2]
∅:∅[2.196] → [63.1707:1824]
B:B[63.1707] → [63.1707:1824]
BD:B[63.1707] → [63.1707:1824]
```
      end
  App.open_for_writing =
      function(filename)
        local result = love.filesystem.newFile(filename)
```
Resurrecting zombie bytes in app.lua at line 436 [64.2]
∅:∅[2.331] → [63.1871:1881]
B:B[63.1871] → [63.1871:1881]
BD:B[63.1871] → [63.1871:1881]
```
      end
```

Merge lines.love

Dependencies

In channels

Change contents

File deletion: commands.lua, commands.lua

Replacement in text_tests.lua at line 1604 [20.2]

Replacement in text_tests.lua at line 1663 [20.2]

Deletion in text.lua at line 8 [23.1]

Solving an order conflict in text.lua at line 8 [23.1]

Replacement in text.lua at line 15 [23.1]

Deletion in text.lua at line 21 [23.1]

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

Deletion in text.lua at line 27 [23.1]

Resurrecting zombie bytes in text.lua at line 27 [23.1]

Insertion in text.lua at line 27 [23.1]

Replacement in text.lua at line 35 [23.1]

Insertion in text.lua at line 41 [23.1]

Deletion in text.lua at line 47 [23.1]

Deletion in text.lua at line 108 [23.1]

Insertion in text.lua at line 136 [23.1]

Replacement in text.lua at line 830 [23.1]

Deletion in text.lua at line 1042 [23.1]

Deletion in text.lua at line 1048 [23.1]

Insertion in text.lua at line 1052 [23.1]

Replacement in source_commands.lua at line 46 [47.11]

Replacement in source_commands.lua at line 51 [47.11]

Replacement in source_commands.lua at line 57 [47.11]

Replacement in source_commands.lua at line 98 [47.11]

Replacement in source_commands.lua at line 110 [47.11]

Replacement in source_commands.lua at line 125 [47.11]

Replacement in source_commands.lua at line 189 [47.11]

Replacement in source_commands.lua at line 206 [47.11]

Replacement in source_commands.lua at line 217 [47.11]

Replacement in source_commands.lua at line 244 [47.11]

Replacement in source_commands.lua at line 262 [47.11]

Replacement in search.lua at line 17 [20.48846]

Deletion in search.lua at line 23 [20.48846]

Solving an order conflict in search.lua at line 23 [20.48846]

Deletion in run.lua at line 76 [11.178044]

Replacement in run.lua at line 77 [11.178044]

Replacement in run.lua at line 79 [11.178044]

Deletion in run.lua at line 113 [11.178044]

Deletion in run.lua at line 123 [11.178044]

Deletion in run.lua at line 188 [11.178044]

Replacement in run.lua at line 201 [11.178044]

Deletion in run.lua at line 204 [11.178044]

Solving an order conflict in run.lua at line 204 [11.178044]

Deletion in run.lua at line 244 [11.178044]

Deletion in run.lua at line 268 [11.178044]

Replacement in run.lua at line 369 [11.178044]

Deletion in run.lua at line 458 [11.178044]

Replacement in run.lua at line 459 [11.178044]

Replacement in run.lua at line 473 [11.178044]

Replacement in run.lua at line 479 [11.178044]

Deletion in run.lua at line 486 [11.178044]

Replacement in run.lua at line 487 [11.178044]

Replacement in run.lua at line 489 [11.178044]

Deletion in run.lua at line 545 [11.178044]

Deletion in run.lua at line 746 [11.178044]

Deletion in run.lua at line 778 [11.178044]

Deletion in run.lua at line 790 [11.178044]

Deletion in run.lua at line 792 [11.178044]

Replacement in run.lua at line 880 [11.178044]

Replacement in run.lua at line 884 [11.178044]

Deletion in run.lua at line 889 [11.178044]

Replacement in run.lua at line 902 [11.178044]

Deletion in run.lua at line 979 [11.178044]

Deletion in run.lua at line 994 [11.178044]

Deletion in run.lua at line 1072 [11.178044]

Deletion in run.lua at line 1087 [11.178044]

Replacement in run.lua at line 1115 [11.178044]

Deletion in run.lua at line 1149 [11.178044]

Deletion in run.lua at line 1255 [11.178044]

Deletion in run.lua at line 1268 [11.178044]

Deletion in run.lua at line 1325 [11.178044]

Deletion in run.lua at line 1328 [11.178044]

Deletion in run.lua at line 1573 [11.178044]

Resurrecting zombie bytes in run.lua at line 1641 [11.178044]

Insertion in run.lua at line 1641 [11.178044]

Deletion in run.lua at line 1651 [11.178044]