akkartik/wardley.love - Change S2MISTTMPEULTO6WRO4Q4NRUO7XC2PTZW3UBR7K7SO6JPZO6HBHAC

add state arg to a few functions

Text.draw_highlight
Text.clip_selection
Text.selection
Text.cut_selection
Text.delete_selection
Text.delete_selection_without_undo
Text.mouse_pos
Text.to_pos

Created by Kartik K. Agaram on July 12, 2022

S2MISTTMPEULTO6WRO4Q4NRUO7XC2PTZW3UBR7K7SO6JPZO6HBHAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 50 [5.1]

∅:D[2.665] → [4.3:90]

∅:D[6.54769] → [4.3:90]

B:BD[7.68] → [4.3:90]

∅:D[4.90] → [8.3:54]

B:BD[7.142] → [8.3:54]

        local lo, hi = Text.clip_selection(line_index, pos, pos+frag_len, left, right)
        Text.draw_highlight(line, x,y, pos, lo,hi)

[2.665]

[7.1056]

        local lo, hi = Text.clip_selection(State, line_index, pos, pos+frag_len, left, right)
        Text.draw_highlight(State, line, x,y, pos, lo,hi)

Replacement in text.lua at line 185 [5.1]

B:BD[9.1225] → [9.1225:1309]

      Text.delete_selection(State.margin_left, App.screen.width-State.margin_right)

[9.1225]

[3.55]

      Text.delete_selection(State, State.margin_left, App.screen.width-State.margin_right)

Replacement in text.lua at line 226 [5.1]

B:BD[9.2976] → [9.2976:3060]

      Text.delete_selection(State.margin_left, App.screen.width-State.margin_right)

[9.2976]

[3.109]

      Text.delete_selection(State, State.margin_left, App.screen.width-State.margin_right)

Replacement in select.lua at line 3 [10.43980]

B:BD[10.44053] → [6.78624:78722]

-- Return any intersection of the region from Editor_state.selection1 to Editor_state.cursor1 (or

[10.44053]

[10.44125]

-- Return any intersection of the region from State.selection1 to State.cursor1 (or

Replacement in select.lua at line 7 [10.43980]

B:BD[10.44321] → [6.78723:78833]

-- apos must be less than bpos. However Editor_state.selection1 and Editor_state.cursor1 can be in any order.

[10.44321]

[10.44405]

-- apos must be less than bpos. However State.selection1 and State.cursor1 can be in any order.

Replacement in select.lua at line 9 [10.43980]

B:BD[10.44455] → [4.239:305]

B:BD[4.305] → [6.78834:79044]

function Text.clip_selection(line_index, apos, bpos, left, right)
  if Editor_state.selection1.line == nil then return nil,nil end
  -- min,max = sorted(Editor_state.selection1,Editor_state.cursor1)
  local minl,minp = Editor_state.selection1.line,Editor_state.selection1.pos

[10.44455]

[10.44653]

function Text.clip_selection(State, line_index, apos, bpos, left, right)
  if State.selection1.line == nil then return nil,nil end
  -- min,max = sorted(State.selection1,State.cursor1)
  local minl,minp = State.selection1.line,State.selection1.pos

Replacement in select.lua at line 15 [10.43980]

B:BD[11.1213] → [4.306:350]

    maxl,maxp = Text.mouse_pos(left, right)

[11.1213]

[10.44737]

    maxl,maxp = Text.mouse_pos(State, left, right)

Replacement in select.lua at line 17 [10.43980]

B:BD[10.44744] → [6.79045:79112]

    maxl,maxp = Editor_state.cursor1.line,Editor_state.cursor1.pos

[10.44744]

[10.44785]

    maxl,maxp = State.cursor1.line,State.cursor1.pos

Replacement in select.lua at line 54 [10.43980]
∅:D[12.291] → [8.177:229]
B:BD[8.177] → [8.177:229]
```
function Text.draw_highlight(line, x,y, pos, lo,hi)
```
[12.291]
[8.229]
```
function Text.draw_highlight(State, line, x,y, pos, lo,hi)
```

Replacement in select.lua at line 72 [10.43980]

B:BD[13.152] → [6.79113:79197]

    love.graphics.rectangle('fill', x+lo_px,y, text_width,Editor_state.line_height)

[13.152]

[13.153]

    love.graphics.rectangle('fill', x+lo_px,y, text_width,State.line_height)

Replacement in select.lua at line 79 [10.43980]
B:BD[10.45876] → [4.351:388]
```
function Text.mouse_pos(left, right)
```
[10.45876]
[10.45902]
```
function Text.mouse_pos(State, left, right)
```

Replacement in select.lua at line 81 [10.43980]

B:BD[10.45938] → [6.79198:79358]

  if Editor_state.recent_mouse.time and Editor_state.recent_mouse.time > time-0.1 then
    return Editor_state.recent_mouse.line, Editor_state.recent_mouse.pos

[10.45938]

[10.46046]

  if State.recent_mouse.time and State.recent_mouse.time > time-0.1 then
    return State.recent_mouse.line, State.recent_mouse.pos

Replacement in select.lua at line 84 [10.43980]

B:BD[10.46052] → [6.79359:79399]

∅:D[6.79399] → [4.389:463]

B:BD[10.46079] → [4.389:463]

  Editor_state.recent_mouse.time = time
  local line,pos = Text.to_pos(App.mouse_x(), App.mouse_y(), left, right)

[10.46052]

[10.46148]

  State.recent_mouse.time = time
  local line,pos = Text.to_pos(State, App.mouse_x(), App.mouse_y(), left, right)

Replacement in select.lua at line 87 [10.43980]

B:BD[10.46163] → [6.79400:79482]

    Editor_state.recent_mouse.line = line
    Editor_state.recent_mouse.pos = pos

[10.46163]

[10.46219]

    State.recent_mouse.line = line
    State.recent_mouse.pos = pos

Replacement in select.lua at line 90 [10.43980]

B:BD[10.46225] → [6.79483:79554]

  return Editor_state.recent_mouse.line, Editor_state.recent_mouse.pos

[10.46225]

[10.46270]

  return State.recent_mouse.line, State.recent_mouse.pos

Replacement in select.lua at line 93 [10.43980]

B:BD[10.46275] → [4.464:503]

B:BD[4.503] → [6.79555:79610]

function Text.to_pos(x,y, left, right)
  for line_index,line in ipairs(Editor_state.lines) do

[10.46275]

[10.46343]

function Text.to_pos(State, x,y, left, right)
  for line_index,line in ipairs(State.lines) do

Replacement in select.lua at line 103 [10.43980]

B:BD[14.10] → [4.504:545]

B:BD[4.545] → [6.79611:79668]

∅:D[15.49] → [14.40:74]

∅:D[6.79668] → [14.40:74]

B:BD[14.40] → [14.40:74]

B:BD[14.74] → [4.546:583]

function Text.cut_selection(left, right)
  if Editor_state.selection1.line == nil then return end
  local result = Text.selection()
  Text.delete_selection(left, right)

[14.10]

[14.100]

function Text.cut_selection(State, left, right)
  if State.selection1.line == nil then return end
  local result = Text.selection(State)
  Text.delete_selection(State, left, right)

Replacement in select.lua at line 110 [10.43980]

B:BD[10.46500] → [4.584:628]

B:BD[4.628] → [6.79669:79810]

function Text.delete_selection(left, right)
  if Editor_state.selection1.line == nil then return end
  local minl,maxl = minmax(Editor_state.selection1.line, Editor_state.cursor1.line)

[10.46500]

[10.46591]

function Text.delete_selection(State, left, right)
  if State.selection1.line == nil then return end
  local minl,maxl = minmax(State.selection1.line, State.cursor1.line)

Replacement in select.lua at line 114 [10.43980]

B:BD[10.46629] → [4.629:679]

B:BD[4.679] → [6.79811:79891]

  Text.delete_selection_without_undo(left, right)
  record_undo_event({before=before, after=snapshot(Editor_state.cursor1.line)})

[10.46629]

[10.46735]

  Text.delete_selection_without_undo(State, left, right)
  record_undo_event({before=before, after=snapshot(State.cursor1.line)})

Replacement in select.lua at line 118 [10.43980]

B:BD[10.46740] → [4.680:737]

B:BD[4.737] → [6.79892:80165]

function Text.delete_selection_without_undo(left, right)
  if Editor_state.selection1.line == nil then return end
  -- min,max = sorted(Editor_state.selection1,Editor_state.cursor1)
  local minl,minp = Editor_state.selection1.line,Editor_state.selection1.pos
  local maxl,maxp = Editor_state.cursor1.line,Editor_state.cursor1.pos

[10.46740]

[10.46968]

function Text.delete_selection_without_undo(State, left, right)
  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

Replacement in select.lua at line 131 [10.43980]

B:BD[10.47135] → [6.80166:80515]

  -- update Editor_state.cursor1 and Editor_state.selection1
  Editor_state.cursor1.line = minl
  Editor_state.cursor1.pos = minp
  if Text.lt1(Editor_state.cursor1, Editor_state.screen_top1) then
    Editor_state.screen_top1.line = Editor_state.cursor1.line
    _,Editor_state.screen_top1.pos = Text.pos_at_start_of_cursor_screen_line(left, right)

[10.47135]

[16.1160]

  -- 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_cursor_screen_line(left, right)

Replacement in select.lua at line 138 [10.43980]
B:BD[16.1166] → [6.80516:80547]
```
  Editor_state.selection1 = {}
```
[16.1166]
[10.47231]
```
  State.selection1 = {}
```

Replacement in select.lua at line 140 [10.43980]

B:BD[10.47298] → [6.80548:80733]

  Text.clear_cache(Editor_state.lines[minl])
  local min_offset = Text.offset(Editor_state.lines[minl].data, minp)
  local max_offset = Text.offset(Editor_state.lines[maxl].data, maxp)

[10.47298]

[10.47487]

  Text.clear_cache(State.lines[minl])
  local min_offset = Text.offset(State.lines[minl].data, minp)
  local max_offset = Text.offset(State.lines[maxl].data, maxp)

Replacement in select.lua at line 145 [10.43980]

B:BD[10.47540] → [6.80734:80868]

    Editor_state.lines[minl].data = Editor_state.lines[minl].data:sub(1, min_offset-1)..Editor_state.lines[minl].data:sub(max_offset)

[10.47540]

[10.47635]

    State.lines[minl].data = State.lines[minl].data:sub(1, min_offset-1)..State.lines[minl].data:sub(max_offset)

Replacement in select.lua at line 149 [10.43980]

B:BD[10.47674] → [6.80869:80929]

  local rhs = Editor_state.lines[maxl].data:sub(max_offset)

[10.47674]

[10.47721]

  local rhs = State.lines[maxl].data:sub(max_offset)

Replacement in select.lua at line 151 [10.43980]
B:BD[10.47747] → [6.80930:80970]
```
    table.remove(Editor_state.lines, i)
```
[10.47747]
[10.47774]
```
    table.remove(State.lines, i)
```

Replacement in select.lua at line 153 [10.43980]

B:BD[10.47780] → [6.80971:81061]

  Editor_state.lines[minl].data = Editor_state.lines[minl].data:sub(1, min_offset-1)..rhs

[10.47780]

[10.47844]

  State.lines[minl].data = State.lines[minl].data:sub(1, min_offset-1)..rhs

Replacement in select.lua at line 156 [10.43980]

B:BD[10.47849] → [10.47849:47875]

B:BD[10.47875] → [6.81062:81335]

function Text.selection()
  if Editor_state.selection1.line == nil then return end
  -- min,max = sorted(Editor_state.selection1,Editor_state.cursor1)
  local minl,minp = Editor_state.selection1.line,Editor_state.selection1.pos
  local maxl,maxp = Editor_state.cursor1.line,Editor_state.cursor1.pos

[10.47849]

[10.48057]

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

Replacement in select.lua at line 169 [10.43980]

B:BD[10.48224] → [6.81336:81476]

  local min_offset = Text.offset(Editor_state.lines[minl].data, minp)
  local max_offset = Text.offset(Editor_state.lines[maxl].data, maxp)

[10.48224]

[10.48338]

  local min_offset = Text.offset(State.lines[minl].data, minp)
  local max_offset = Text.offset(State.lines[maxl].data, maxp)

Replacement in select.lua at line 172 [10.43980]

B:BD[10.48361] → [6.81477:81548]

    return Editor_state.lines[minl].data:sub(min_offset, max_offset-1)

[10.48361]

[10.48419]

    return State.lines[minl].data:sub(min_offset, max_offset-1)

Replacement in select.lua at line 175 [10.43980]

B:BD[10.48447] → [6.81549:81614]

  local result = {Editor_state.lines[minl].data:sub(min_offset)}

[10.48447]

[10.48503]

  local result = {State.lines[minl].data:sub(min_offset)}

Replacement in select.lua at line 177 [10.43980]

B:BD[10.48528] → [6.81615:81719]

    if Editor_state.lines[i].mode == 'text' then
      table.insert(result, Editor_state.lines[i].data)

[10.48528]

[10.48607]

    if State.lines[i].mode == 'text' then
      table.insert(result, State.lines[i].data)

Replacement in select.lua at line 181 [10.43980]

B:BD[10.48621] → [6.81720:81795]

  table.insert(result, Editor_state.lines[maxl].data:sub(1, max_offset-1))

[10.48621]

[17.163]

  table.insert(result, State.lines[maxl].data:sub(1, max_offset-1))

Replacement in edit.lua at line 302 [18.413]

B:BD[18.10886] → [19.6874:6956]

    Text.delete_selection(State.margin_left, App.screen.width-State.margin_right)

[18.10886]

[18.10956]

    Text.delete_selection(State, State.margin_left, App.screen.width-State.margin_right)

Replacement in edit.lua at line 368 [18.413]
∅:D[19.8507] → [18.13320:13351]
∅:D[6.104726] → [18.13320:13351]
B:BD[18.13320] → [18.13320:13351]
```
    local s = Text.selection()
```
[19.8507]
[18.13351]
```
    local s = Text.selection(State)
```

Replacement in edit.lua at line 374 [18.413]

B:BD[19.8593] → [19.8593:8682]

    local s = Text.cut_selection(State.margin_left, App.screen.width-State.margin_right)

[19.8593]

[18.13588]

    local s = Text.cut_selection(State, State.margin_left, App.screen.width-State.margin_right)