akkartik/luaML.love - Change 34BZ5ZKNAB4XQGXOPVBZHBDYD5D3X4V6T72XZSR5LJXF4UIVSWQAC

Merge lines.love

Created by Kartik K. Agaram on September 16, 2023

34BZ5ZKNAB4XQGXOPVBZHBDYD5D3X4V6T72XZSR5LJXF4UIVSWQAC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[9.2] → [10.147062:147101]

BFD:BFD[10.147101] → [10.83723:83723]

B:BD[11.254] → [7.92:245]

∅:D[7.245] → [10.87409:87430]

B:BD[11.128] → [7.8:91]

∅:D[7.91] → [10.84098:84244]

  if show_line_numbers then
    App.color(Line_number_color)
    love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)
  end
  initialize_color()
function Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
  line_cache.starty = y
  line_cache.startpos = startpos

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[9.2] → [10.165725:165764]

BFD:BFD[10.165764] → [10.152440:152440]

B:BD[10.154970] → [7.250:341]

B:BD[10.156342] → [7.649:753]

B:BD[12.161] → [5.12:57]

B:BD[12.310] → [5.58:103]

∅:D[5.103] → [12.310:372]

∅:D[5.57] → [12.161:220]

∅:D[7.753] → [13.21245:21511]

B:BD[13.20316] → [7.401:648]

∅:D[7.648] → [13.20384:21096]

B:BD[13.19888] → [7.342:400]

∅:D[7.400] → [10.155376:155429]

∅:D[7.341] → [14.440:471]

B:BD[13.19883] → [4.180:327]

∅:D[4.327] → [13.19883:19888]

B:BD[15.714] → [4.58:179]

∅:D[4.179] → [13.19877:19883]

B:BD[15.391] → [4.12:57]

∅:D[4.57] → [15.437:484]

    left = math.floor(left),  -- left margin for text; line numbers go to the left of this
      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)
    edit.put_cursor_on_next_text_line(State)
    edit.put_cursor_on_next_text_line(State)
    for i=1,math.floor(-dy) do
      Text.down(State)
    end
    for i=1,math.floor(dy) do
      Text.up(State)
    end
--?       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)
        local buttonx = State.left-Margin_left+4
        if show_line_numbers then
          buttonx = 4  -- HACK: position draw buttons at a fixed x on screen
        end
        button(State, 'draw', {x=buttonx, y=y+4, w=12,h=12, color={1,1,0},
          icon = icon.insert_drawing,
          onpress1 = function()
                       Drawing.before = snapshot(State, line_index-1, line_index)
                       table.insert(State.lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})
                       table.insert(State.line_cache, line_index, {})
                       if State.cursor1.line >= line_index then
                         State.cursor1.line = State.cursor1.line+1
                       end
                       schedule_save(State)
                       record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})
                     end,
        })
function edit.draw(State, hide_cursor, show_line_numbers)
  State.button_handlers = {}
  App.color(Text_color)
    right = math.floor(right),
  if State.lines[State.cursor1.line].mode == 'text' then
    break
  end
  State.cursor1.line = State.cursor1.line+1
  State.cursor1.pos = 1
  end
end
function edit.put_cursor_on_next_text_line(State)
  while true do
  if State.cursor1.line >= #State.lines then
    break
  end
    edit.put_cursor_on_next_text_line(State)
  end
end
function edit.invalid1(State, loc1)

File deletion: source.lua, source.lua

BFD:BFD[9.2] → [10.177652:177686]

BFD:BFD[10.177686] → [10.165766:165766]

B:BD[10.172847] → [7.755:851]

∅:D[7.851] → [10.172898:173083]

B:BD[16.104] → [8.13:85]

∅:D[8.85] → [16.105:108]

  edit.draw(Editor_state, --[[hide cursor?]] Show_file_navigator, --[[show line numbers]] true)
  if Show_log_browser_side then
    -- divider
    App.color(Divider_color)
    love.graphics.rectangle('fill', App.screen.width/2-1,Menu_status_bar_height, 3,App.screen.height)
    --
  love.window.setTitle('lines.love - source - '..Editor_state.filename)

File deletion: commands.lua, commands.lua
BFD:BFD[9.2] → [10.207726:207762]
BFD:BFD[9.2] → [10.207726:207762]
BFD:BFD[10.207762] → [10.204370:204370]
B:BD[18.58] → [19.33:68]
B:BD[19.68] → [8.106:178]
∅:D[19.68] → [20.164:189]
∅:D[8.178] → [20.164:189]
```
  source.switch_to_file(s..'.lua')
  love.window.setTitle('lines.love - source - '..Editor_state.filename)
  reset_file_navigator()
```

Replacement in source_text.lua at line 6 [23.83786]

∅:D[21.128] → [22.1043:1107]

B:BD[22.1043] → [22.1043:1107]

function Text.draw(State, line_index, y, startpos, hide_cursor)

[21.128]

[23.84161]

function Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)

Replacement in source_text.lua at line 15 [23.83786]

B:BD[21.254] → [2.8:123]

  App.color(Line_number_color)
  love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)

[21.254]

[23.87472]

  if show_line_numbers then
    App.color(Line_number_color)
    love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)
  end

Replacement in source_edit.lua at line 92 [23.152503]

B:BD[23.155033] → [22.8338:8367]

    left = math.floor(left),

[23.155033]

[22.8367]

    left = math.floor(left),  -- left margin for text; line numbers go to the left of this

Replacement in source_edit.lua at line 118 [23.152503]
B:BD[24.391] → [24.391:437]
```
    edit.put_cursor_on_first_text_line(State)
```
[24.391]
[24.437]
```
    edit.put_cursor_on_next_text_line(State)
```

Replacement in source_edit.lua at line 134 [23.152503]

B:BD[24.714] → [24.714:765]

∅:D[24.765] → [25.18307:18378]

B:BD[25.18307] → [25.18307:18378]

B:BD[25.18378] → [24.766:804]

∅:D[24.804] → [25.18407:18427]

B:BD[25.18407] → [25.18407:18427]

function edit.put_cursor_on_first_text_line(State)
  for i,line in ipairs(State.lines) do
    if line.mode == 'text' then
      State.cursor1 = {line=i, pos=1}
      break
    end

[24.714]

[25.18427]

function edit.put_cursor_on_next_text_line(State)
  while true do
  if State.cursor1.line >= #State.lines then
    break
  end
  if State.lines[State.cursor1.line].mode == 'text' then
    break
  end
  State.cursor1.line = State.cursor1.line+1
  State.cursor1.pos = 1

Replacement in source_edit.lua at line 147 [23.152503]
B:BD[25.18438] → [26.199:238]
```
function edit.draw(State, hide_cursor)
```
[25.18438]
[23.155439]
```
function edit.draw(State, hide_cursor, show_line_numbers)
```

Replacement in source_edit.lua at line 176 [23.152503]

B:BD[25.18866] → [2.171:240]

        button(State, 'draw', {x=4, y=y+4, w=12,h=12, color={1,1,0},

[25.18866]

[25.18934]

        local buttonx = State.left-Margin_left+4
        if show_line_numbers then
          buttonx = 4  -- HACK: position draw buttons at a fixed x on screen
        end
        button(State, 'draw', {x=buttonx, y=y+4, w=12,h=12, color={1,1,0},

Replacement in source_edit.lua at line 194 [23.152503]

B:BD[23.156405] → [27.4340:4425]

      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)

[23.156405]

[25.19795]

      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)

Insertion in source_edit.lua at line 340 [23.152503]
[28.161]
[28.161]
```
    edit.put_cursor_on_next_text_line(State)
```
Insertion in source_edit.lua at line 346 [23.152503]
[28.324]
[28.324]
```
    edit.put_cursor_on_next_text_line(State)
```
Replacement in source.lua at line 77 [23.165829]
∅:D[29.104] → [30.11:56]
B:BD[23.167379] → [30.11:56]
```
  love.window.setTitle('text.love - source')
```
[29.104]
[29.105]
```
  love.window.setTitle('text.love - source - '..Editor_state.filename)
```

Replacement in source.lua at line 240 [23.165829]

B:BD[23.172910] → [26.538:604]

  edit.draw(Editor_state, --[[hide cursor?]] Show_file_navigator)

[23.172910]

[23.172961]

  edit.draw(Editor_state, --[[hide cursor?]] Show_file_navigator, --[[show line numbers]] true)

Deletion in log_browser.lua at line 38 [23.191243]
∅:D[26.1049] → [23.192680:192730]
B:BD[23.192680] → [23.192680:192730]
```
      line.filename = guess_source(line.filename)
```

Deletion in log_browser.lua at line 75 [23.191243]

B:BD[23.194046] → [23.194046:194243]

end
function guess_source(filename)
  local possible_source = filename:gsub('%.lua$', '%.splua')
  if file_exists(possible_source) then
    return possible_source
  else
    return filename
  end

Deletion in edit.lua at line 80 [32.413]
B:BD[31.472] → [4.345:390]
```
    edit.put_cursor_on_next_text_line(State)
```
Resurrecting zombie bytes in edit.lua at line 80 [32.413]
∅:∅[4.390] → [31.518:565]
∅:∅[24.955] → [31.518:565]
B:B[31.518] → [31.518:565]
BD:B[31.518] → [31.518:565]
```
  end
end
function edit.invalid1(State, loc1)
```
Solving an order conflict in edit.lua at line 80 [32.413]
[24.955]
[31.518]
Resurrecting zombie bytes in edit.lua at line 98 [32.413]
∅:∅[33.754] → [31.790:795]
B:B[31.790] → [31.790:795]
BD:B[31.790] → [31.790:795]
```
end
```

Deletion in edit.lua at line 100 [32.413]

B:BD[31.795] → [4.391:512]

BD:BD[31.795] → [4.391:512]

B:BD[35.361] → [4.513:660]

BD:BD[35.361] → [4.513:660]

function edit.put_cursor_on_next_text_line(State)
  while true do
  if State.cursor1.line >= #State.lines then
    break
  if State.lines[State.cursor1.line].mode == 'text' then
    break
  end
  State.cursor1.line = State.cursor1.line+1
  State.cursor1.pos = 1
  end

Insertion in drawing.lua at line 194 [37.98]

[36.17584]

    local r = round(geom.dist(center.x, center.y, mx, my))

Replacement in drawing.lua at line 196 [37.98]

B:BD[36.17629] → [36.17629:17716]

    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, App.mouse_x(),App.mouse_y()))

[36.17629]

[36.17716]

    love.graphics.circle('line', cx,cy, Drawing.pixels(r, width))

Deletion in drawing.lua at line 221 [37.98]
B:BD[38.3637] → [3.31:90]
BD:BD[38.3637] → [3.31:90]
B:BD[39.2104] → [3.91:157]
BD:BD[39.2104] → [3.91:157]
```
    local r = round(geom.dist(center.x, center.y, mx, my))
    love.graphics.circle('line', cx,cy, Drawing.pixels(r, width))
```
Solving an order conflict in drawing.lua at line 221 [37.98]
[36.18674]
[40.883]

Insertion in drawing.lua at line 252 [37.98]

[36.20230]

  if line_cache.starty == nil then
    -- some event cleared starty just this frame
    -- draw in this frame will soon set starty
    -- just skip this frame
    return
  end

Deletion in drawing.lua at line 301 [37.98]

B:BD[41.2924] → [6.31:207]

BD:BD[41.2924] → [6.31:207]

  if line_cache.starty == nil then
    -- some event cleared starty just this frame
    -- draw in this frame will soon set starty
    -- just skip this frame
    return
  end

Solving an order conflict in drawing.lua at line 301 [37.98]
[36.21692]
[42.7466]

Replacement in commands.lua at line 132 [23.203826]

B:BD[43.3002] → [43.3002:3081]

  local candidate = guess_source(s..'.lua')
  source.switch_to_file(candidate)

[43.3002]

[43.3081]

  source.switch_to_file(s..'.lua')
  love.window.setTitle('lines.love - source - '..Editor_state.filename)

Merge lines.love

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: commands.lua, commands.lua

Replacement in source_text.lua at line 6 [23.83786]

Replacement in source_text.lua at line 15 [23.83786]

Replacement in source_edit.lua at line 92 [23.152503]

Replacement in source_edit.lua at line 118 [23.152503]

Replacement in source_edit.lua at line 134 [23.152503]

Replacement in source_edit.lua at line 147 [23.152503]

Replacement in source_edit.lua at line 176 [23.152503]

Replacement in source_edit.lua at line 194 [23.152503]

Insertion in source_edit.lua at line 340 [23.152503]

Insertion in source_edit.lua at line 346 [23.152503]

Replacement in source.lua at line 77 [23.165829]

Replacement in source.lua at line 240 [23.165829]

Deletion in log_browser.lua at line 38 [23.191243]

Deletion in log_browser.lua at line 75 [23.191243]

Deletion in edit.lua at line 80 [32.413]

Resurrecting zombie bytes in edit.lua at line 80 [32.413]

Solving an order conflict in edit.lua at line 80 [32.413]

Resurrecting zombie bytes in edit.lua at line 98 [32.413]

Deletion in edit.lua at line 100 [32.413]

Insertion in drawing.lua at line 194 [37.98]

Replacement in drawing.lua at line 196 [37.98]

Deletion in drawing.lua at line 221 [37.98]

Solving an order conflict in drawing.lua at line 221 [37.98]

Insertion in drawing.lua at line 252 [37.98]

Deletion in drawing.lua at line 301 [37.98]

Solving an order conflict in drawing.lua at line 301 [37.98]

Replacement in commands.lua at line 132 [23.203826]