akkartik/wardley.love - Change NCSQ5FPI5NSJR3UDSXBUHUXJ2HPEVTYEVALFYAXCPO5FKRLRY7EQC

Merge text.love

Created by Kartik K. Agaram on June 4, 2023

NCSQ5FPI5NSJR3UDSXBUHUXJ2HPEVTYEVALFYAXCPO5FKRLRY7EQC

Dependencies

In channels

main

Change contents

File deletion: source_select.lua, source_select.lua

BFD:BFD[6.2] → [7.30050:30091]

BFD:BFD[7.30091] → [7.23288:23288]

B:BD[7.27134] → [9.4417:4513]

∅:D[9.4513] → [7.27134:30049]

B:BD[7.26449] → [9.4254:4416]

∅:D[9.4416] → [7.26807:26813]

  return State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)
end
function Text.cut_selection(State)
  if State.selection1.line == nil then return end
  local result = Text.selection(State)
  Text.delete_selection(State)
  return result
end
function Text.delete_selection(State)
  if State.selection1.line == nil then return end
  local minl,maxl = minmax(State.selection1.line, State.cursor1.line)
  local before = snapshot(State, minl, maxl)
  Text.delete_selection_without_undo(State)
  record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
end
function Text.delete_selection_without_undo(State)
  if State.selection1.line == nil then return end
  -- min,max = sorted(State.selection1,State.cursor1)
  local minl,minp = State.selection1.line,State.selection1.pos
  local maxl,maxp = State.cursor1.line,State.cursor1.pos
  if minl > maxl then
    minl,maxl = maxl,minl
    minp,maxp = maxp,minp
  elseif minl == maxl then
    if minp > maxp then
      minp,maxp = maxp,minp
    end
  end
  -- update State.cursor1 and State.selection1
  State.cursor1.line = minl
  State.cursor1.pos = minp
  if Text.lt1(State.cursor1, State.screen_top1) then
    State.screen_top1.line = State.cursor1.line
    State.screen_top1.pos = Text.pos_at_start_of_screen_line(State, State.cursor1)
  end
  State.selection1 = {}
  -- delete everything between min (inclusive) and max (exclusive)
  Text.clear_screen_line_cache(State, minl)
  local min_offset = Text.offset(State.lines[minl].data, minp)
  local max_offset = Text.offset(State.lines[maxl].data, maxp)
  if minl == maxl then
--?     print('minl == maxl')
    State.lines[minl].data = State.lines[minl].data:sub(1, min_offset-1)..State.lines[minl].data:sub(max_offset)
    return
  end
  assert(minl < maxl)
  local rhs = State.lines[maxl].data:sub(max_offset)
  for i=maxl,minl+1,-1 do
    table.remove(State.lines, i)
    table.remove(State.line_cache, i)
  end
  State.lines[minl].data = State.lines[minl].data:sub(1, min_offset-1)..rhs
end
function Text.selection(State)
  if State.selection1.line == nil then return end
  -- min,max = sorted(State.selection1,State.cursor1)
  local minl,minp = State.selection1.line,State.selection1.pos
  local maxl,maxp = State.cursor1.line,State.cursor1.pos
  if minl > maxl then
    minl,maxl = maxl,minl
    minp,maxp = maxp,minp
  elseif minl == maxl then
    if minp > maxp then
      minp,maxp = maxp,minp
    end
  end
  local min_offset = Text.offset(State.lines[minl].data, minp)
  local max_offset = Text.offset(State.lines[maxl].data, maxp)
  if minl == maxl then
    return State.lines[minl].data:sub(min_offset, max_offset-1)
  end
  assert(minl < maxl)
  local result = {State.lines[minl].data:sub(min_offset)}
  for i=minl+1,maxl-1 do
    if State.lines[i].mode == 'text' then
      table.insert(result, State.lines[i].data)
    end
  end
  table.insert(result, State.lines[maxl].data:sub(1, max_offset-1))
  return table.concat(result, '\n')
end
  local x,y = App.mouse_x(), App.mouse_y()
  if y < State.line_cache[State.screen_top1.line].starty then
    return State.screen_top1.line, State.screen_top1.pos
  end

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[6.2] → [10.83739:83784]

BFD:BFD[10.83784] → [10.3561:3561]

B:BD[11.6905] → [5.120:908]

B:BD[12.9175] → [5.909:2939]

B:BD[11.7371] → [5.2940:3735]

∅:D[5.3735] → [10.33196:33201]

∅:D[5.2939] → [12.9175:9225]

∅:D[5.908] → [12.9170:9175]

B:BD[10.3600] → [5.7:119]

∅:D[5.119] → [10.3600:3631]

end
function test_select_text_using_mouse_starting_above_text()
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.selection1 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
function test_select_text_using_mouse_starting_above_text_wrapping_line()
  -- first screen line starts in the middle of a line
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=2, pos=5}
  Editor_state.screen_top1 = {line=2, pos=3}
  Editor_state.screen_bottom1 = {}
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  -- selection is at screen top
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 2, 'selection:line')
  check_eq(Editor_state.selection1.pos, 3, 'selection:pos')
end
function test_select_text_using_mouse_starting_below_text()
  -- I'd like to test what happens when a mouse click is below some page of
  -- text, potentially even in the middle of a line.
  -- However, it's brittle to set up a text line boundary just right.
  -- So I'm going to just check things below the bottom of the final line of
  -- text when it's in the middle of the screen.
  -- final screen line ends in the middle of screen
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abcde'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'ab', 'baseline:screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'cde', 'baseline:screen:2')
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, 5,App.screen.height-5, 1)
  -- selection is past bottom-most text in screen
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 6, 'selection:pos')
end
end
function test_select_all_text()
  -- display a single line of text
  App.screen.init{width=75, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc def'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  -- select all
  App.fake_key_press('lctrl')
  edit.run_after_keychord(Editor_state, 'C-a')
  App.fake_key_release('lctrl')
  edit.key_release(Editor_state, 'lctrl')
  -- selection
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 8, 'cursor:pos')
end
function test_select_text_using_mouse_and_shift()
end
-- Arguably this should be called source_edit_tests.lua,
-- but that would mess up the git blame at this point.
function test_initial_state()

File deletion: source_text.lua, source_text.lua

BFD:BFD[6.2] → [10.147125:147164]

BFD:BFD[10.147164] → [10.83786:83786]

B:BD[10.125684] → [5.3775:4251]

∅:D[5.4251] → [10.125684:125801]

B:BD[10.124465] → [5.3737:3774]

∅:D[5.3774] → [10.124784:125105]

function Text.pos_at_end_of_screen_line(State, loc1)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  local most_recent_final_pos = utf8.len(State.lines[loc1.line].data)+1
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then
      return most_recent_final_pos
    end
    most_recent_final_pos = spos-1
  end
  assert(false)
end
function Text.cursor_at_final_screen_line(State)
  Text.populate_screen_line_starting_pos(State, State.cursor1.line)
-- result: pos, index of screen line
function Text.pos_at_start_of_screen_line(State, loc1)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then
      return spos,i

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[6.2] → [10.165788:165827]

BFD:BFD[10.165827] → [10.152503:152503]

B:BD[10.157214] → [5.4467:4572]

B:BD[10.157442] → [5.4573:4846]

B:BD[12.24407] → [5.5376:5440]

B:BD[12.24544] → [5.5441:5524]

B:BD[13.9297] → [5.5525:5641]

B:BD[12.25282] → [5.5642:5837]

∅:D[5.5837] → [14.11:386]

∅:D[5.5641] → [12.24808:25282]

∅:D[5.5524] → [13.9162:9297]

∅:D[5.5440] → [12.24407:24544]

B:BD[15.20874] → [5.5268:5375]

∅:D[5.5375] → [15.20897:20935]

B:BD[10.157756] → [5.4959:5267]

∅:D[5.5267] → [10.157756:157761]

B:BD[16.5749] → [5.4943:4958]

∅:D[5.4958] → [15.20824:20834]

B:BD[13.9085] → [5.4927:4942]

∅:D[5.4942] → [15.20407:20742]

B:BD[16.5682] → [5.4847:4926]

∅:D[5.4926] → [12.24094:24234]

∅:D[5.4846] → [10.157442:157490]

∅:D[5.4572] → [10.157280:157442]

B:BD[10.156588] → [5.4426:4466]

∅:D[5.4466] → [10.156588:156691]

B:BD[10.156405] → [5.4340:4425]

∅:D[5.4425] → [15.19795:20061]

B:BD[10.156055] → [5.4302:4339]

∅:D[5.4339] → [15.18495:18527]

B:BD[10.155825] → [5.4256:4301]

∅:D[5.4301] → [10.155825:155947]

--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
  if y < State.top then
    State.old_cursor1 = State.cursor1
    State.old_selection1 = State.selection1
    State.mousepress_shift = App.shift_down()
    State.selection1 = {
        line=State.screen_top1.line,
        pos=State.screen_top1.pos,
    }
    return
  end
--?     print_and_log('edit.mouse_release: no current drawing')
--?           print_and_log(('edit.mouse_release: in line %d'):format(line_index))
--?           print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))
--?     print_and_log(('edit.mouse_release: finally selection %s,%s cursor %d,%d'):format(tostring(State.selection1.line), tostring(State.selection1.pos), State.cursor1.line, State.cursor1.pos))
  end
end
function edit.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    for i=1,math.floor(dy) do
      Text.up(State)
    end
  elseif dy < 0 then
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
    for i=1,math.floor(-dy) do
      Text.down(State)
    end
          if State.mousepress_shift then
            if State.old_selection1.line == nil then
              State.selection1 = State.old_cursor1
            else
              State.selection1 = State.old_selection1
            end
          end
          State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
          if eq(State.cursor1, State.selection1) then
            State.selection1 = {}
          end
          break
        end
      end
    end
          State.cursor1 = {
              line=line_index,
              pos=Text.to_pos_on_line(State, line_index, x, y),
          }
    for line_index,line in ipairs(State.lines) do
      if line.mode == 'text' then
        if Text.in_line(State, line_index, x,y) then
--?   print_and_log(('edit.mouse_release: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
  if State.lines.current_drawing then
  -- still here? click is below all screen lines
  State.old_cursor1 = State.cursor1
  State.old_selection1 = State.selection1
  State.mousepress_shift = App.shift_down()
  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }
end
        return
      end
        return
      end
    elseif line.mode == 'drawing' then
      local line_cache = State.line_cache[line_index]
      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then
        State.lines.current_drawing_index = line_index
        State.lines.current_drawing = line
        Drawing.before = snapshot(State, line_index)
--?         print_and_log(('edit.mouse_press: in line %d'):format(line_index))
        State.old_cursor1 = State.cursor1
        State.old_selection1 = State.selection1
        State.mousepress_shift = App.shift_down()
  for line_index,line in ipairs(State.lines) do
  if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then
    -- press on a button and it returned 'true' to short-circuit
    return
  end
  State.screen_bottom1 = screen_bottom1
  if State.search_term then
    Text.draw_search_bar(State)
  end
end
function edit.update(State, dt)
      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)
--?       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)
    screen_bottom1.line = line_index
    if line.mode == 'text' then
  local screen_bottom1 = {line=nil, pos=nil}
--?   print('== draw')
  for line_index = State.screen_top1.line,#State.lines do
    local line = State.lines[line_index]

File deletion: source.lua, source.lua
BFD:BFD[6.2] → [10.177715:177749]
BFD:BFD[6.2] → [10.177715:177749]
BFD:BFD[10.177749] → [10.165829:165829]
B:BD[10.168464] → [5.5839:5893]
∅:D[5.5893] → [10.168464:168600]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
function source.load_settings()
  local settings = Settings.source
  love.graphics.setFont(love.graphics.newFont(settings.font_height))
```
File deletion: run.lua, run.lua
BFD:BFD[6.2] → [10.183867:183898]
BFD:BFD[6.2] → [10.183867:183898]
BFD:BFD[10.183898] → [10.178107:178107]
B:BD[10.179202] → [5.5898:5952]
∅:D[5.5952] → [10.179202:179300]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
function run.load_settings()
  love.graphics.setFont(love.graphics.newFont(Settings.font_height))
```
Insertion in main.lua at line 81 [18.2]
[17.3084]
[17.3084]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
```
Deletion in edit.lua at line 115 [21.413]
B:BD[19.3095] → [20.3634:3688]
```
    State.screen_bottom1 = {line=line_index, pos=nil}
```

Deletion in edit.lua at line 124 [21.413]

B:BD[21.5923] → [17.8081:8211]

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

Merge text.love

Dependencies

In channels

Change contents

File deletion: source_select.lua, source_select.lua

File deletion: source_text_tests.lua, source_text_tests.lua

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

Insertion in main.lua at line 81 [18.2]

Deletion in edit.lua at line 115 [21.413]

Deletion in edit.lua at line 124 [21.413]