akkartik/pensieve.love - Change UAX3KJOIN3XBSLKP4IAWAWSCI3DLDKF22A6HRMGA4FHY3AS2QRVAC

undo all optimizations back to commit c6b68678a

Now all we're doing is sticking to 10 columns. Let's see how this goes.

If this goes well then I'll take stock of all the different things I tried and decide which version is cleanest. For example, I'd like to drop either Editable_cursor_pane_updated_screen_top or options.ignore_editable_cursor_pane.

Created by Kartik K. Agaram on December 11, 2022

UAX3KJOIN3XBSLKP4IAWAWSCI3DLDKF22A6HRMGA4FHY3AS2QRVAC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 195 [4.1]
B:BD[3.589] → [2.3:42]
```
-- return true if anything was handled
```
Deletion in text.lua at line 208 [4.1]
B:BD[5.1313] → [2.43:59]
```
    return true
```
Deletion in text.lua at line 219 [4.1]
B:BD[5.1459] → [2.60:76]
```
    return true
```
Deletion in text.lua at line 266 [4.1]
B:BD[5.1675] → [2.77:93]
```
    return true
```
Deletion in text.lua at line 300 [4.1]
B:BD[5.1891] → [2.94:110]
```
    return true
```
Deletion in text.lua at line 304 [4.1]
B:BD[6.4438] → [2.111:127]
```
    return true
```
Deletion in text.lua at line 307 [4.1]
B:BD[6.4536] → [2.128:144]
```
    return true
```
Deletion in text.lua at line 312 [4.1]
B:BD[7.69] → [2.145:161]
```
    return true
```
Deletion in text.lua at line 317 [4.1]
B:BD[7.92] → [2.162:178]
```
    return true
```
Deletion in text.lua at line 321 [4.1]
B:BD[6.5013] → [2.179:195]
```
    return true
```
Deletion in text.lua at line 324 [4.1]
B:BD[6.5116] → [2.196:212]
```
    return true
```
Deletion in text.lua at line 329 [4.1]
B:BD[7.174] → [2.213:229]
```
    return true
```
Deletion in text.lua at line 334 [4.1]
B:BD[7.202] → [2.230:246]
```
    return true
```
Deletion in text.lua at line 337 [4.1]
B:BD[6.5528] → [2.247:263]
```
    return true
```
Deletion in text.lua at line 340 [4.1]
B:BD[6.5632] → [2.264:280]
```
    return true
```
Deletion in text.lua at line 345 [4.1]
B:BD[8.1304] → [2.281:297]
```
    return true
```
Deletion in text.lua at line 350 [4.1]
B:BD[7.260] → [2.298:314]
```
    return true
```
Deletion in text.lua at line 353 [4.1]
B:BD[6.6037] → [2.315:331]
```
    return true
```
Deletion in text.lua at line 357 [4.1]
B:BD[6.6134] → [2.332:348]
```
    return true
```
Deletion in text.lua at line 362 [4.1]
B:BD[7.322] → [2.349:365]
```
    return true
```
Deletion in text.lua at line 367 [4.1]
B:BD[7.344] → [2.366:382]
```
    return true
```
Deletion in text.lua at line 370 [4.1]
B:BD[6.6605] → [2.383:399]
```
    return true
```
Deletion in text.lua at line 373 [4.1]
B:BD[6.6706] → [2.400:416]
```
    return true
```
Deletion in text.lua at line 378 [4.1]
B:BD[7.418] → [2.417:433]
```
    return true
```
Deletion in text.lua at line 383 [4.1]
B:BD[7.444] → [2.434:450]
```
    return true
```

Insertion in run.lua at line 111 [10.178044]

[9.8023]

[9.8050]


  -- This little bit of state ensures we don't mess with a pane's screen_top
  -- if it was just used to update the viewport.
  Editable_cursor_pane_updated_screen_top = false

Replacement in run.lua at line 292 [10.178044]
B:BD[9.12677] → [11.17:38]
B:BD[11.38] → [2.465:490]
```
function plan_draw()
--?   print('plan draw')
```
[9.12677]
[12.72]
```
function plan_draw(options)
--?   print('update pane bounds')
```

Replacement in run.lua at line 317 [10.178044]

B:BD[11.53] → [11.53:431]

∅:D[11.431] → [9.13711:13725]

B:BD[9.13711] → [9.13711:13725]

B:BD[9.13725] → [11.432:2295]

          if body_sy < Display_settings.y then
            pane.screen_top1, y_offset = schema1_of_y(pane, Display_settings.y - body_sy)
          else
            pane.screen_top1 = {line=1, pos=1}
          end
          if body_sy < Display_settings.y then
            pane.top = Margin_above
          else
            pane.top = body_sy - Display_settings.y + Margin_above
          end
          pane.top = Header_height + pane.top - y_offset
--?           print('bounds: =>', pane.top)
          pane.left = sx - Display_settings.x
          pane.right = pane.left + Display_settings.column_width
          pane.width = pane.right - pane.left
        else
          -- clear bounds to catch issues early
          pane.top = nil
--?           print('bounds: =>', pane.top)
        end
        sy = sy + Margin_above + height(pane) + Margin_below + Padding_vertical
      end
    else
      -- clear bounds to catch issues early
      for _, pane in ipairs(column) do
        pane.top = nil
      end
    end
    sx = sx + Margin_right + Display_settings.column_width + Padding_horizontal + Margin_left
  end
end
-- keep the structure of this function sync'd with refresh_pane_height
function plan_draw_maybe_updating_screen_top_in_cursor_pane(update_screen_top_in_cursor_pane)
--?   print('update pane bounds')
--?   print(#Surface, 'columns;', num_panes(), 'panes')
  Panes_to_draw = {}
  local sx = Padding_horizontal + Margin_left
  for column_index, column in ipairs(Surface) do
    if should_show_column(sx) then
      local sy = Padding_vertical
      for pane_index, pane in ipairs(column) do
        if sy > Display_settings.y + App.screen.height - Header_height then
          break
        end
--?         print('bounds:', column_index, pane_index, sx,sy)
        if should_show_pane(pane, sy) then
          table.insert(Panes_to_draw, pane)
          -- stash some short-lived variables
          pane.column_index = column_index
          pane.pane_index = pane_index
          local y_offset = 0
          local body_sy = sy
          if column[pane_index].title then
            body_sy = body_sy + 5+Line_height+5
          end
          if should_update_screen_top(column_index, pane_index, update_screen_top_in_cursor_pane) then

[11.53]

[9.13809]

          if should_update_screen_top(column_index, pane_index, pane, options) then

Replacement in run.lua at line 351 [10.178044]

B:BD[13.847] → [11.2296:2379]

function should_update_screen_top(column_index, pane_index, including_cursor_pane)

[13.847]

[9.15024]

function should_update_screen_top(column_index, pane_index, pane, options)

Replacement in run.lua at line 354 [10.178044]

B:BD[9.15138] → [11.2380:2411]

  return including_cursor_pane

[9.15138]

[9.15470]

  -- update the cursor pane either if it's not editable, or
  -- if it was explicitly requested
  if not pane.editable then return true end
  if options == nil then return true end
  if not options.ignore_editable_cursor_pane then return true end
  if not Editable_cursor_pane_updated_screen_top then return true end
  return false

Replacement in run.lua at line 818 [10.178044]

B:BD[11.2836] → [2.512:867]

            local modified = edit.keychord_pressed(pane, chord, key)
            if modified then
              local cursor_pane_updated_screen_top = maybe_update_screen_top_of_cursor_pane(pane, old_top)
              pane._height = nil
              plan_draw_maybe_updating_screen_top_in_cursor_pane(not cursor_pane_updated_screen_top)
            end

[11.2836]

[11.3123]

            edit.keychord_pressed(pane, chord, key)
            maybe_update_screen_top_of_cursor_pane(pane, old_top)
            pane._height = nil
            plan_draw{ignore_editable_cursor_pane=true}

Replacement in run.lua at line 1168 [10.178044]

B:BD[9.44094] → [11.3161:3229]

  local update = not eq(old_top, pane.screen_top1)
  if update then

[9.44094]

[9.44222]

  Editable_cursor_pane_updated_screen_top = not eq(old_top, pane.screen_top1)
  if Editable_cursor_pane_updated_screen_top then

Deletion in run.lua at line 1177 [10.178044]
B:BD[9.44774] → [11.3230:3246]
```
  return update
```
Deletion in edit.lua at line 312 [14.413]
B:BD[14.10343] → [2.879:917]
```
-- return true if chord was processed
```
Deletion in edit.lua at line 387 [14.413]
B:BD[15.497] → [2.918:936]
```
      return true
```
Deletion in edit.lua at line 411 [14.413]
B:BD[15.525] → [2.937:955]
```
      return true
```
Deletion in edit.lua at line 428 [14.413]
B:BD[15.551] → [2.956:972]
```
    return true
```
Deletion in edit.lua at line 448 [14.413]
B:BD[5.2812] → [2.973:989]
```
    return true
```

Replacement in edit.lua at line 486 [14.413]

B:BD[16.1400] → [2.990:1037]

    return Text.keychord_pressed(State, chord)

[16.1400]

[14.15990]

    Text.keychord_pressed(State, chord)

undo all optimizations back to commit c6b68678a

Dependencies

In channels

Change contents

Deletion in text.lua at line 195 [4.1]

Deletion in text.lua at line 208 [4.1]

Deletion in text.lua at line 219 [4.1]

Deletion in text.lua at line 266 [4.1]

Deletion in text.lua at line 300 [4.1]

Deletion in text.lua at line 304 [4.1]

Deletion in text.lua at line 307 [4.1]

Deletion in text.lua at line 312 [4.1]

Deletion in text.lua at line 317 [4.1]

Deletion in text.lua at line 321 [4.1]

Deletion in text.lua at line 324 [4.1]

Deletion in text.lua at line 329 [4.1]

Deletion in text.lua at line 334 [4.1]

Deletion in text.lua at line 337 [4.1]

Deletion in text.lua at line 340 [4.1]

Deletion in text.lua at line 345 [4.1]

Deletion in text.lua at line 350 [4.1]

Deletion in text.lua at line 353 [4.1]

Deletion in text.lua at line 357 [4.1]

Deletion in text.lua at line 362 [4.1]

Deletion in text.lua at line 367 [4.1]

Deletion in text.lua at line 370 [4.1]

Deletion in text.lua at line 373 [4.1]

Deletion in text.lua at line 378 [4.1]

Deletion in text.lua at line 383 [4.1]

Insertion in run.lua at line 111 [10.178044]

Replacement in run.lua at line 292 [10.178044]

Replacement in run.lua at line 317 [10.178044]

Replacement in run.lua at line 351 [10.178044]

Replacement in run.lua at line 354 [10.178044]

Replacement in run.lua at line 818 [10.178044]

Replacement in run.lua at line 1168 [10.178044]

Deletion in run.lua at line 1177 [10.178044]

Deletion in edit.lua at line 312 [14.413]

Deletion in edit.lua at line 387 [14.413]

Deletion in edit.lua at line 411 [14.413]

Deletion in edit.lua at line 428 [14.413]

Deletion in edit.lua at line 448 [14.413]

Replacement in edit.lua at line 486 [14.413]