akkartik/techmeet.love - Change RM2LKJEWX6HPOUPJ3ADOAHCRKQEH6IDDKV3TJMJELYCLASIWPO5AC

Merge lines.love

Created by Kartik K. Agaram on September 5, 2022

RM2LKJEWX6HPOUPJ3ADOAHCRKQEH6IDDKV3TJMJELYCLASIWPO5AC

Dependencies

In channels

main

Change contents

File deletion: commands.lua, commands.lua

BFD:BFD[6.2] → [7.207726:207762]

BFD:BFD[7.207762] → [7.204370:204370]

B:BD[7.205424] → [3.25416:25474]

∅:D[3.25474] → [7.205482:207725]

    add_hotkey_to_menu('ctrl+i: create/edit debug print')
    add_hotkey_to_menu('ctrl+f: find in file')
    add_hotkey_to_menu('alt+left alt+right: prev/next word')
  elseif Focus == 'log_browser' then
    -- nothing yet
  else
    assert(false, 'unknown focus "'..Focus..'"')
  end
  add_hotkey_to_menu('ctrl+z ctrl+y: undo/redo')
  add_hotkey_to_menu('ctrl+x ctrl+c ctrl+v: cut/copy/paste')
  add_hotkey_to_menu('ctrl+= ctrl+- ctrl+0: zoom')
end
function add_hotkey_to_menu(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  local width = App.width(Text_cache[s])
  if Menu_cursor + width > App.screen.width - 5 then
    return
  end
  App.color(Menu_command_color)
  App.screen.draw(Text_cache[s], Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30
end
function source.draw_file_navigator()
  for i,file in ipairs(File_navigation.candidates) do
    if file == 'source' then
      App.color(Menu_border_color)
      love.graphics.line(Menu_cursor-10,2, Menu_cursor-10,Menu_status_bar_height-2)
    end
    add_file_to_menu(file, i == File_navigation.index)
  end
end
function add_file_to_menu(s, cursor_highlight)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  local width = App.width(Text_cache[s])
  if Menu_cursor + width > App.screen.width - 5 then
    return
  end
  if cursor_highlight then
    App.color(Menu_highlight_color)
    love.graphics.rectangle('fill', Menu_cursor-5,5-2, App.width(Text_cache[s])+5*2,Editor_state.line_height+2*2)
  end
  App.color(Menu_command_color)
  App.screen.draw(Text_cache[s], Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30
end
function keychord_pressed_on_file_navigator(chord, key)
  if chord == 'escape' then
    Show_file_navigator = false
  elseif chord == 'return' then
    local candidate = guess_source(File_navigation.candidates[File_navigation.index]..'.lua')
    source.switch_to_file(candidate)
    Show_file_navigator = false
  elseif chord == 'left' then
    if File_navigation.index > 1 then
      File_navigation.index = File_navigation.index-1
    end
  elseif chord == 'right' then
    if File_navigation.index < #File_navigation.candidates then
      File_navigation.index = File_navigation.index+1
    end
  end
end

Insertion in text.lua at line 512 [11.1]

[9.114]

[10.187]

    Text.populate_screen_line_starting_pos(State, State.cursor1.line)

Deletion in text.lua at line 515 [11.1]
∅:D[12.718] → [10.313:313]
B:BD[13.622] → [10.313:313]
B:BD[14.224] → [3.652:722]
BD:BD[14.224] → [3.652:722]
```
    Text.populate_screen_line_starting_pos(State, State.cursor1.line)
```
Solving an order conflict in text.lua at line 515 [11.1]
[12.718]
[15.6881]
Deletion in text.lua at line 692 [11.1]
B:BD[16.2786] → [3.914:973]
```
--?   print('to2:', State.cursor1.line, State.cursor1.pos)
```
Solving an order conflict in text.lua at line 692 [11.1]
[12.1220]
[16.2786]

Insertion in text.lua at line 696 [11.1]

[17.580]

[12.1221]

--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Deletion in text.lua at line 698 [11.1]

B:BD[17.580] → [3.1079:1262]

BD:BD[17.580] → [3.1079:1262]

--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Solving an order conflict in text.lua at line 698 [11.1]
[12.1342]
[18.3208]

Resurrecting zombie bytes in text.lua at line 735 [11.1]

B:B[18.3781] → [3.1263:1425]

BD:B[18.3781] → [3.1263:1425]

--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Solving an order conflict in text.lua at line 735 [11.1]
[12.1851]
[3.1263]

Replacement in source_file.lua at line 108 [7.150241]

B:BD[3.14473] → [3.14473:14519]

      outfile:write(json.encode(shape), '\n')

[3.14473]

[3.14519]

      outfile:write(json.encode(shape))
      outfile:write('\n')

Replacement in source_file.lua at line 112 [7.150241]
B:BD[3.14693] → [3.14693:14725]
```
      outfile:write(line, '\n')
```
[3.14693]
[3.14725]
```
      outfile:write(line)
      outfile:write('\n')
```
Replacement in source_file.lua at line 120 [7.150241]
B:BD[3.15012] → [3.15012:15044]
```
      outfile:write(line, '\n')
```
[3.15012]
[3.15044]
```
      outfile:write(line)
      outfile:write('\n')
```

Replacement in source_file.lua at line 123 [7.150241]

B:BD[3.15083] → [3.15083:15199]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}), '\n')

[3.15083]

[3.15199]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}))
      outfile:write('\n')

Replacement in source_file.lua at line 126 [7.150241]

B:BD[3.15235] → [3.15235:15409]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}), '\n')

[3.15235]

[3.15409]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}))
      outfile:write('\n')

Deletion in main.lua at line 54 [19.2]
B:BD[8.61346] → [8.61346:61405]
```
      load_file_from_source_or_save_directory('icons.lua')
```

Replacement in main.lua at line 56 [19.2]

B:BD[8.61530] → [8.61530:61777]

    load_file_from_source_or_save_directory('drawing.lua')
      load_file_from_source_or_save_directory('geom.lua')
      load_file_from_source_or_save_directory('help.lua')
    load_file_from_source_or_save_directory('drawing_tests.lua')
  else

[8.61530]

[8.61777]

  elseif Current_app == 'source' then

Insertion in main.lua at line 69 [19.2]

[8.62552]

[20.150]

  else
    assert(false, 'unknown app "'..Current_app..'"')

Deletion in main.lua at line 96 [19.2]
B:BD[7.185709] → [4.16:54]
BD:BD[7.185709] → [4.16:54]
```
  elseif Current_app == 'source' then
```
Deletion in main.lua at line 264 [19.2]
B:BD[21.268] → [8.64014:64014]
B:BD[7.186724] → [4.55:115]
BD:BD[7.186724] → [4.55:115]
BD:BD[7.186724] → [4.55:115]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
```
Solving an order conflict in main.lua at line 264 [19.2]
[21.268]
Deletion in file.lua at line 50 [23.15083]
B:BD[23.16169] → [3.25126:25183]
```
      outfile:write(line.data)
      outfile:write('\n')
```
Solving an order conflict in file.lua at line 50 [23.15083]
[22.671]
[23.16206]

Resurrecting zombie bytes in edit.lua at line 141 [25.413]

∅:∅[24.787] → [13.2215:2388]

B:B[13.2215] → [13.2215:2388]

BD:B[13.2215] → [13.2215:2388]

    if y + State.line_height > App.screen.height then
--?       print('draw:', line.data, '--', y,'+',State.line_height, '>', App.screen.height, 'stop')
      break
    end

Insertion in edit.lua at line 141 [25.413]
[26.3030]
[13.2215]
```
--?     print('draw:', y, line_index, line)
```
Resurrecting zombie bytes in edit.lua at line 146 [25.413]
B:B[26.3095] → [3.25185:25239]
BD:B[26.3095] → [3.25185:25239]
```
    State.screen_bottom1 = {line=line_index, pos=nil}
```
Solving an order conflict in edit.lua at line 146 [25.413]
[13.2388]
[3.25185]

Insertion in edit.lua at line 182 [25.413]

[27.2054]

[26.4191]

--?   print('screen bottom: '..tostring(State.screen_bottom1.pos)..' in '..tostring(State.lines[State.screen_bottom1.line].data))

Deletion in app.lua at line 403 [29.2]

B:BD[28.8162] → [5.31:913]

  if Current_app == nil or Current_app == 'run' then
    App.open_for_reading = function(filename) return io.open(filename, 'r') end
    App.open_for_writing = function(filename) return io.open(filename, 'w') end
  elseif Current_app == 'source' then
    -- HACK: source editor requires a couple of different foundational definitions
    App.open_for_reading =
        function(filename)
          local result = love.filesystem.newFile(filename)
          local ok, err = result:open('r')
          if ok then
            return result
          else
            return ok, err
          end
        end
    App.open_for_writing =
        function(filename)
          local result = love.filesystem.newFile(filename)
          local ok, err = result:open('w')
          if ok then
            return result
          else
            return ok, err
          end
        end
  end

Solving an order conflict in app.lua at line 403 [29.2]
[22.1881]
[30.1742]

Merge lines.love

Dependencies

In channels

Change contents

File deletion: commands.lua, commands.lua

Insertion in text.lua at line 512 [11.1]

Deletion in text.lua at line 515 [11.1]

Solving an order conflict in text.lua at line 515 [11.1]

Deletion in text.lua at line 692 [11.1]

Solving an order conflict in text.lua at line 692 [11.1]

Insertion in text.lua at line 696 [11.1]

Deletion in text.lua at line 698 [11.1]

Solving an order conflict in text.lua at line 698 [11.1]

Resurrecting zombie bytes in text.lua at line 735 [11.1]

Solving an order conflict in text.lua at line 735 [11.1]

Replacement in source_file.lua at line 108 [7.150241]

Replacement in source_file.lua at line 112 [7.150241]

Replacement in source_file.lua at line 120 [7.150241]

Replacement in source_file.lua at line 123 [7.150241]

Replacement in source_file.lua at line 126 [7.150241]

Deletion in main.lua at line 54 [19.2]

Replacement in main.lua at line 56 [19.2]

Insertion in main.lua at line 69 [19.2]

Deletion in main.lua at line 96 [19.2]

Deletion in main.lua at line 264 [19.2]

Solving an order conflict in main.lua at line 264 [19.2]

Deletion in file.lua at line 50 [23.15083]

Solving an order conflict in file.lua at line 50 [23.15083]

Resurrecting zombie bytes in edit.lua at line 141 [25.413]

Insertion in edit.lua at line 141 [25.413]

Resurrecting zombie bytes in edit.lua at line 146 [25.413]

Solving an order conflict in edit.lua at line 146 [25.413]

Insertion in edit.lua at line 182 [25.413]

Deletion in app.lua at line 403 [29.2]

Solving an order conflict in app.lua at line 403 [29.2]