akkartik/pensieve.love - Change 6GP2UPJYSIBGAUEPRIS5ZOAM2XNQ3YQMX3TM5ARXWAJ2DTQ4RYLAC

reorg: move search-specific state into mode table

This eliminates a class of bugs by construction where we look up variables in the wrong state.

Created by akkartik on September 8, 2024

6GP2UPJYSIBGAUEPRIS5ZOAM2XNQ3YQMX3TM5ARXWAJ2DTQ4RYLAC

Dependencies

In channels

main

Change contents

Deletion in run.lua at line 75 [8.178044]
∅:D[6.136] → [7.2916:2936]
B:BD[9.6766] → [7.2916:2936]
∅:D[7.2936] → [9.6803:6880]
B:BD[9.6803] → [9.6803:6880]
B:BD[9.6880] → [7.2937:2985]
B:BD[7.2985] → [10.18:47]
∅:D[10.47] → [9.6955:6994]
∅:D[7.2985] → [9.6955:6994]
B:BD[9.6955] → [9.6955:6994]
B:BD[9.6994] → [10.48:73]
```
    search_term='',
    search_backup_x=nil, search_backup_y=nil, search_backup_cursor_pane=nil,
    search_all_query=nil, search_all_terms=nil,
    search_all_progress=nil,
    search_all_progress_indicator=nil,
    search_all_pane=nil,
```

Replacement in run.lua at line 411 [8.178044]

B:BD[9.15712] → [9.15712:15785]

    Text.draw_search_bar(Display_settings, --[[force show cursor]] true)

[9.15712]

[5.170]

    Text.draw_search_bar(Display_settings.state, --[[force show cursor]] true)

Replacement in run.lua at line 843 [8.178044]

B:BD[9.27688] → [9.27688:27755]

    Display_settings.search_term = Display_settings.search_term..t

[9.27688]

[9.27794]

    Display_settings.state.search_term = Display_settings.state.search_term..t

Replacement in run.lua at line 846 [8.178044]

B:BD[9.27843] → [9.27843:27959]

B:BD[9.27959] → [11.18:89]

    Display_settings.x = Display_settings.search_backup_x
    Display_settings.y = Display_settings.search_backup_y
    Cursor_pane = deepcopy(Display_settings.search_backup_cursor_pane)

[9.27843]

[9.28020]

    Display_settings.x = Display_settings.state.search_backup_x
    Display_settings.y = Display_settings.state.search_backup_y
    Cursor_pane = deepcopy(Display_settings.state.search_backup_cursor_pane)

Replacement in run.lua at line 855 [8.178044]

∅:D[5.1299] → [9.28216:28293]

B:BD[9.28216] → [9.28216:28293]

    Display_settings.search_all_query = Display_settings.search_all_query..t

[5.1299]

[5.1300]

    Display_settings.state.search_all_query = Display_settings.state.search_all_query..t

Replacement in run.lua at line 857 [8.178044]
B:BD[5.1359] → [5.1359:1400]
```
    Display_settings.state.id = 'normal'
```
[5.1359]
[5.1400]
```
    Display_settings.state = {'normal'}
```

Replacement in run.lua at line 1048 [8.178044]

B:BD[9.34458] → [9.34458:34508]

  pane.search_term = Display_settings.search_term

[9.34458]

[2.17]

  pane.search_term = Display_settings.state.search_term

Replacement in run.lua at line 1141 [8.178044]

B:BD[9.38261] → [9.38261:38311]

  pane.search_term = Display_settings.search_term

[9.38261]

[2.479]

  pane.search_term = Display_settings.state.search_term

Deletion in run.lua at line 1303 [8.178044]
B:BD[9.46519] → [5.1919:1960]
```
    Display_settings.state.id = 'normal'
```

Replacement in run.lua at line 1307 [8.178044]

B:BD[9.46679] → [9.46679:46795]

B:BD[9.46795] → [4.0:71]

    Display_settings.x = Display_settings.search_backup_x
    Display_settings.y = Display_settings.search_backup_y
    Cursor_pane = deepcopy(Display_settings.search_backup_cursor_pane)

[9.46679]

[11.90]

    Display_settings.x = Display_settings.state.search_backup_x
    Display_settings.y = Display_settings.state.search_backup_y
    Cursor_pane = deepcopy(Display_settings.state.search_backup_cursor_pane)
    Display_settings.state = {id='normal'}

Deletion in run.lua at line 1312 [8.178044]
∅:D[11.106] → [9.46856:46888]
B:BD[9.46856] → [9.46856:46888]
```
    -- don't forget search text
```
Replacement in run.lua at line 1313 [8.178044]
B:BD[9.46920] → [5.1961:2002]
```
    Display_settings.state.id = 'normal'
```
[9.46920]
[9.46957]
```
    Display_settings.state = {id='normal'}
```
Deletion in run.lua at line 1316 [8.178044]
∅:D[12.70] → [9.47007:47034]
B:BD[9.47007] → [9.47007:47034]
```
    -- forget old viewport
```

Deletion in run.lua at line 1317 [8.178044]

B:BD[9.47079] → [9.47079:47250]

    Display_settings.search_backup_x = nil
    Display_settings.search_backup_y = nil
    Display_settings.search_backup_cursor_pane = nil
    -- don't forget search text

Replacement in run.lua at line 1318 [8.178044]

B:BD[9.47285] → [9.47285:47505]

    local len = utf8.len(Display_settings.search_term)
    local byte_offset = Text.offset(Display_settings.search_term, len)
    Display_settings.search_term = string.sub(Display_settings.search_term, 1, byte_offset-1)

[9.47285]

[9.47544]

    local len = utf8.len(Display_settings.state.search_term)
    local byte_offset = Text.offset(Display_settings.state.search_term, len)
    Display_settings.state.search_term = string.sub(Display_settings.state.search_term, 1, byte_offset-1)

Replacement in run.lua at line 1323 [8.178044]

B:BD[9.47593] → [9.47593:47709]

B:BD[9.47709] → [11.107:178]

    Display_settings.x = Display_settings.search_backup_x
    Display_settings.y = Display_settings.search_backup_y
    Cursor_pane = deepcopy(Display_settings.search_backup_cursor_pane)

[9.47593]

[9.47770]

    Display_settings.x = Display_settings.state.search_backup_x
    Display_settings.y = Display_settings.state.search_backup_y
    Cursor_pane = deepcopy(Display_settings.state.search_backup_cursor_pane)

Replacement in run.lua at line 1331 [8.178044]

B:BD[9.47914] → [9.47914:47991]

--?     print('backspace; search term is now', Display_settings.search_term)

[9.47914]

[9.47991]

--?     print('backspace; search term is now', Display_settings.state.search_term)

Replacement in run.lua at line 1333 [8.178044]

B:BD[9.48020] → [13.18:103]

    Display_settings.search_term = Display_settings.search_term..App.get_clipboard()

[9.48020]

[9.48147]

    Display_settings.state.search_term = Display_settings.state.search_term..App.get_clipboard()

Replacement in run.lua at line 1336 [8.178044]

B:BD[9.48196] → [9.48196:48312]

B:BD[9.48312] → [11.179:250]

    Display_settings.x = Display_settings.search_backup_x
    Display_settings.y = Display_settings.search_backup_y
    Cursor_pane = deepcopy(Display_settings.search_backup_cursor_pane)

[9.48196]

[9.48373]

    Display_settings.x = Display_settings.state.search_backup_x
    Display_settings.y = Display_settings.state.search_backup_y
    Cursor_pane = deepcopy(Display_settings.state.search_backup_cursor_pane)

Replacement in run.lua at line 1344 [8.178044]

B:BD[9.48517] → [9.48517:48590]

--?     print('paste; search term is now', Display_settings.search_term)

[9.48517]

[9.48590]

--?     print('paste; search term is now', Display_settings.state.search_term)

Replacement in run.lua at line 1379 [8.178044]
B:BD[9.49585] → [5.2003:2044]
∅:D[5.2044] → [9.49622:49654]
B:BD[9.49622] → [9.49622:49654]
B:BD[9.49654] → [10.74:121]
```
    Display_settings.state.id = 'normal'
    -- don't forget search text
    Display_settings.search_all_progress = nil
```
[9.49585]
[9.49698]
```
    Display_settings.state = {id='normal'}
```

Replacement in run.lua at line 1383 [8.178044]

B:BD[9.49806] → [5.2045:2093]

    Display_settings.state.id = 'searching_all'

[9.49806]

[9.49850]

    Display_settings.state = {id='searching_all'}

Replacement in run.lua at line 1386 [8.178044]

B:BD[9.49901] → [9.49901:50141]

B:BD[9.50190] → [9.50190:50276]

    local len = utf8.len(Display_settings.search_all_query)
    local byte_offset = Text.offset(Display_settings.search_all_query, len)
    Display_settings.search_all_query = string.sub(Display_settings.search_all_query, 1, byte_offset-1)
--?     print('backspace; search_all term is now', Display_settings.search_all_query)

[9.49901]

[9.50276]

    local len = utf8.len(Display_settings.state.search_all_query)
    local byte_offset = Text.offset(Display_settings.state.search_all_query, len)
    Display_settings.state.search_all_query = string.sub(Display_settings.state.search_all_query, 1, byte_offset-1)
--?     print('backspace; search_all term is now', Display_settings.state.search_all_query)

Replacement in run.lua at line 1391 [8.178044]

B:BD[9.50305] → [13.104:199]

∅:D[13.199] → [9.50452:50534]

B:BD[9.50452] → [9.50452:50534]

    Display_settings.search_all_query = Display_settings.search_all_query..App.get_clipboard()
--?     print('paste; search_all term is now', Display_settings.search_all_query)

[9.50305]

[9.50534]

    Display_settings.state.search_all_query = Display_settings.state.search_all_query..App.get_clipboard()
--?     print('paste; search_all term is now', Display_settings.state.search_all_query)

Replacement in commands.lua at line 290 [15.39]

B:BD[14.2859] → [7.4193:4255]

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

[14.2859]

[5.2296]

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

Replacement in commands.lua at line 293 [15.39]

B:BD[16.80] → [17.2040:2116]

    x = x+Display_settings.font:getWidth(Display_settings.search_all_query)

[16.80]

[14.3021]

    x = x+Display_settings.font:getWidth(Display_settings.state.search_all_query)

Replacement in commands.lua at line 301 [15.39]

B:BD[14.3420] → [18.478:592]

    App.screen.print(Display_settings.search_all_progress_indicator, --[[x]] 5, --[[y]] Menu_status_bar_height+5)

[14.3420]

[19.3944]

    App.screen.print(Display_settings.state.search_all_progress_indicator, --[[x]] 5, --[[y]] Menu_status_bar_height+5)

Replacement in commands.lua at line 635 [15.39]
B:BD[20.286] → [5.2564:2605]
```
  Display_settings.state.id = 'maximize'
```
[20.286]
[21.1544]
```
  Display_settings.state = {id = 'maximize'}
```
Replacement in commands.lua at line 639 [15.39]
B:BD[20.322] → [5.2606:2645]
```
  Display_settings.state.id = 'normal'
```
[20.322]
[22.2687]
```
  Display_settings.state = {id = 'normal'}
```

Replacement in commands.lua at line 835 [15.39]

B:BD[23.288] → [23.288:400]

B:BD[23.400] → [3.67:136]

∅:D[3.136] → [23.490:552]

B:BD[23.490] → [23.490:552]

  Display_settings.search_backup_x = Display_settings.x
  Display_settings.search_backup_y = Display_settings.y
  Display_settings.search_backup_cursor_pane = deepcopy(Cursor_pane)
  -- prepare to pass Display_settings to Text.draw_search_bar

[23.288]

[23.552]

  Display_settings.state = {
    id='search',
    search_term = '',
    search_backup_x = Display_settings.x,
    search_backup_y = Display_settings.y,
    search_backup_cursor_pane = deepcopy(Cursor_pane),
  }
  -- prepare to pass Display_settings.state to Text.draw_search_bar

Replacement in commands.lua at line 844 [15.39]

B:BD[23.588] → [5.2646:2685]

∅:D[5.2685] → [23.623:659]

B:BD[23.623] → [23.623:659]

B:BD[23.696] → [23.696:741]

  Display_settings.state.id = 'search'
  Display_settings.search_term = ''
  Display_settings.line_height = Line_height

[23.588]

[14.3735]

  Display_settings.state.font = Display_settings.font
  Display_settings.state.line_height = Line_height

Replacement in commands.lua at line 849 [15.39]

B:BD[14.3783] → [5.2686:2729]

∅:D[5.2729] → [14.3822:3888]

B:BD[14.3822] → [14.3822:3888]

B:BD[14.3888] → [24.1309:1350]

∅:D[24.1397] → [18.808:880]

B:BD[14.3969] → [18.808:880]

  Display_settings.state.id = 'search_all'
  Display_settings.search_all_pane = initialize_search_all_pane()
  Display_settings.search_all_query = ''
  Display_settings.search_all_progress_indicator = 'starting search...'

[14.3783]

[14.4021]

  Display_settings.state = {
    id='search_all',
    search_all_pane = initialize_search_all_pane(),
    search_all_query = '',
    search_all_progress_indicator = 'starting search...',
  }

Replacement in commands.lua at line 869 [15.39]

B:BD[14.4627] → [25.48:108]

  if Display_settings.search_all_query:sub(1,1) == '"' then

[14.4627]

[25.108]

  if Display_settings.state.search_all_query:sub(1,1) == '"' then

Replacement in commands.lua at line 871 [15.39]

B:BD[25.161] → [26.2391:2556]

∅:D[26.2556] → [25.254:375]

B:BD[25.254] → [25.254:375]

    assert(Display_settings.search_all_query:sub(#Display_settings.search_all_query) == '"', 'you can search for strings in quotes, but only one of them by itself')
    Display_settings.search_all_terms = {Display_settings.search_all_query:sub(2, #Display_settings.search_all_query-1)}

[25.161]

[25.375]

    assert(Display_settings.state.search_all_query:sub(#Display_settings.state.search_all_query) == '"', 'you can search for strings in quotes, but only one of them by itself')
    Display_settings.state.search_all_terms = {Display_settings.state.search_all_query:sub(2, #Display_settings.state.search_all_query-1)}

Replacement in commands.lua at line 874 [15.39]

B:BD[25.382] → [25.382:463]

    Display_settings.search_all_terms = split(Display_settings.search_all_query)

[25.382]

[25.463]

    Display_settings.state.search_all_terms = split(Display_settings.state.search_all_query)

Replacement in commands.lua at line 879 [15.39]

∅:D[27.5360] → [14.4741:4844]

B:BD[14.4741] → [14.4741:4844]

  Display_settings.search_all_pane.id = id
  Display_settings.search_all_pane.filename = Directory..id

[27.5360]

[14.4844]

  Display_settings.state.search_all_pane.id = id
  Display_settings.state.search_all_pane.filename = Directory..id

Replacement in commands.lua at line 885 [15.39]

B:BD[14.4931] → [24.1470:1540]

∅:D[24.1540] → [14.5000:5057]

B:BD[14.5000] → [14.5000:5057]

  local column = {name='search: '..Display_settings.search_all_query}
  table.insert(column, Display_settings.search_all_pane)

[14.4931]

[14.5057]

  local column = {name='search: '..Display_settings.state.search_all_query}
  table.insert(column, Display_settings.state.search_all_pane)

Replacement in commands.lua at line 892 [15.39]

B:BD[18.1173] → [10.171:225]

∅:D[10.225] → [18.1224:1307]

B:BD[18.1224] → [18.1224:1307]

B:BD[18.1307] → [10.226:271]

  if Display_settings.search_all_progress == nil then
    Display_settings.search_all_progress_indicator = 'initialized top-level files'
    Display_settings.search_all_progress = {

[18.1173]

[27.5361]

  if Display_settings.state.search_all_progress == nil then
    Display_settings.state.search_all_progress_indicator = 'initialized top-level files'
    Display_settings.state.search_all_progress = {

Replacement in commands.lua at line 898 [15.39]

B:BD[18.1457] → [10.272:485]

∅:D[10.485] → [18.1661:1731]

B:BD[18.1661] → [18.1661:1731]

  elseif Display_settings.search_all_progress.top_level_file_index then
    local current_filename = Display_settings.search_all_progress.top_level_files[Display_settings.search_all_progress.top_level_file_index]
    Display_settings.search_all_progress_indicator = current_filename

[18.1457]

[28.81]

  elseif Display_settings.state.search_all_progress.top_level_file_index then
    local current_filename = Display_settings.state.search_all_progress.top_level_files[Display_settings.state.search_all_progress.top_level_file_index]
    Display_settings.state.search_all_progress_indicator = current_filename

Replacement in commands.lua at line 907 [15.39]

B:BD[18.2758] → [10.486:1152]

    Display_settings.search_all_progress.top_level_file_index = Display_settings.search_all_progress.top_level_file_index+1
    if Display_settings.search_all_progress.top_level_file_index > #Display_settings.search_all_progress.top_level_files then
      Display_settings.search_all_progress.top_level_file_index = nil
      Display_settings.search_all_progress.top_level_files = nil
      Display_settings.search_all_progress.time = os.time()
      Display_settings.search_all_progress.year = os.date('%Y', Display_settings.search_all_progress.time)
      Display_settings.search_all_progress.date = os.date('%Y/%m/%d/', Display_settings.search_all_progress.time)

[18.2758]

[18.3391]

    Display_settings.state.search_all_progress.top_level_file_index = Display_settings.state.search_all_progress.top_level_file_index+1
    if Display_settings.state.search_all_progress.top_level_file_index > #Display_settings.state.search_all_progress.top_level_files then
      Display_settings.state.search_all_progress.top_level_file_index = nil
      Display_settings.state.search_all_progress.top_level_files = nil
      Display_settings.state.search_all_progress.time = os.time()
      Display_settings.state.search_all_progress.year = os.date('%Y', Display_settings.state.search_all_progress.time)
      Display_settings.state.search_all_progress.date = os.date('%Y/%m/%d/', Display_settings.state.search_all_progress.time)

Replacement in commands.lua at line 915 [15.39]

B:BD[18.3399] → [10.1153:1209]

  elseif Display_settings.search_all_progress.date then

[18.3399]

[18.3452]

  elseif Display_settings.state.search_all_progress.date then

Replacement in commands.lua at line 918 [15.39]

B:BD[18.3537] → [10.1210:1442]

    Display_settings.search_all_progress_indicator = Display_settings.search_all_progress.date
    local old_year = Display_settings.search_all_progress.year
    local date_dir = Directory..Display_settings.search_all_progress.date

[18.3537]

[29.160]

    Display_settings.state.search_all_progress_indicator = Display_settings.state.search_all_progress.date
    local old_year = Display_settings.state.search_all_progress.year
    local date_dir = Directory..Display_settings.state.search_all_progress.date

Replacement in commands.lua at line 930 [15.39]

B:BD[30.302] → [10.1443:1523]

            search_in_file(Display_settings.search_all_progress.date..filename)

[30.302]

[30.379]

            search_in_file(Display_settings.state.search_all_progress.date..filename)

Replacement in commands.lua at line 935 [15.39]

B:BD[18.4034] → [10.1524:2009]

    Display_settings.search_all_progress.time = Display_settings.search_all_progress.time - 24*60*60
    Display_settings.search_all_progress.year = os.date('%Y', Display_settings.search_all_progress.time)
    Display_settings.search_all_progress.date = os.date('%Y/%m/%d/', Display_settings.search_all_progress.time)
    if old_year ~= Display_settings.search_all_progress.year then
      local previous_year_info = App.file_info(Directory..Display_settings.search_all_progress.year)

[18.4034]

[18.4505]

    Display_settings.state.search_all_progress.time = Display_settings.state.search_all_progress.time - 24*60*60
    Display_settings.state.search_all_progress.year = os.date('%Y', Display_settings.state.search_all_progress.time)
    Display_settings.state.search_all_progress.date = os.date('%Y/%m/%d/', Display_settings.state.search_all_progress.time)
    if old_year ~= Display_settings.state.search_all_progress.year then
      local previous_year_info = App.file_info(Directory..Display_settings.state.search_all_progress.year)

Replacement in commands.lua at line 941 [15.39]

B:BD[18.4545] → [10.2010:2061]

B:BD[10.2061] → [5.2730:2775]

        Display_settings.search_all_progress = nil
        Display_settings.state.id = 'normal'

[18.4545]

[18.4634]

        Display_settings.state = {id = 'normal'}

Replacement in commands.lua at line 950 [15.39]

B:BD[31.355] → [24.1541:1621]

--?   print('searching '..filename..' for '..Display_settings.search_all_query)

[31.355]

[32.399]

--?   print('searching '..filename..' for '..Display_settings.state.search_all_query)

Replacement in commands.lua at line 958 [15.39]

B:BD[31.566] → [33.128:193]

  if match_all(contents, Display_settings.search_all_terms) then

[31.566]

[34.262]

  if match_all(contents, Display_settings.state.search_all_terms) then

Replacement in commands.lua at line 964 [15.39]

B:BD[33.232] → [33.232:309]

      index = find_any(contents, Display_settings.search_all_terms, index+1)

[33.232]

[33.309]

      index = find_any(contents, Display_settings.state.search_all_terms, index+1)

Replacement in commands.lua at line 974 [15.39]

B:BD[35.587] → [36.415:468]

∅:D[36.468] → [31.1199:1311]

B:BD[31.1199] → [31.1199:1311]

    load_from_disk(Display_settings.search_all_pane)
    Text.redraw_all(Display_settings.search_all_pane)
    refresh_pane_height(Display_settings.search_all_pane)

[35.587]

[37.251]

    load_from_disk(Display_settings.state.search_all_pane)
    Text.redraw_all(Display_settings.state.search_all_pane)
    refresh_pane_height(Display_settings.state.search_all_pane)

Replacement in commands.lua at line 991 [15.39]

B:BD[18.4753] → [10.2062:2109]

  if Display_settings.search_all_progress then

[18.4753]

[34.307]

  if Display_settings.state.search_all_progress then

Replacement in commands.lua at line 993 [15.39]

∅:D[34.351] → [27.5916:6045]

B:BD[18.4907] → [27.5916:6045]

    local success, errmsg = append_to_file(outfilename, 'interrupted at '..Display_settings.search_all_progress_indicator..'\n')

[34.351]

[18.5036]

    local success, errmsg = append_to_file(outfilename, 'interrupted at '..Display_settings.state.search_all_progress_indicator..'\n')

Replacement in commands.lua at line 995 [15.39]

B:BD[18.5078] → [36.469:522]

∅:D[36.522] → [18.5169:5223]

B:BD[18.5169] → [18.5169:5223]

    load_from_disk(Display_settings.search_all_pane)
    Text.redraw_all(Display_settings.search_all_pane)

[18.5078]

[18.5223]

    load_from_disk(Display_settings.state.search_all_pane)
    Text.redraw_all(Display_settings.state.search_all_pane)

Replacement in commands.lua at line 998 [15.39]

B:BD[18.5229] → [10.2110:2155]

B:BD[10.2155] → [5.2776:2815]

  Display_settings.search_all_progress = nil
  Display_settings.state.id = 'normal'

[18.5229]

[18.5306]

  Display_settings.state = {id = 'normal'}