akkartik/pensieve.love - Change QRHK34F2WMGVH44UZGT4ZMLMF5W6GL23YZ723UAD6ZEADYOMTEBAC

refactor: coalesce normal-mode code for editable vs read-only panes

Created by Kartik K. Agaram on August 3, 2022

QRHK34F2WMGVH44UZGT4ZMLMF5W6GL23YZ723UAD6ZEADYOMTEBAC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 706 [7.2]

[5.434]

[6.183]

    if chord == 'C-e' then
      command.exit_editing()
    else
--?       print(('%s pressed in editor pane'):format(chord))
      local old_top = {line=pane.screen_top1.line, pos=pane.screen_top1.pos}
      edit.keychord_pressed(pane, chord, key)
--?       print('screen top after:', pane.screen_top1.line, pane.screen_top1.pos)
      Editable_cursor_pane_updated_screen_top = not eq(old_top, pane.screen_top1)
      if Editable_cursor_pane_updated_screen_top then
--?         print('updating viewport based on screen top')
        Display_settings.y = up_edge_sy(Cursor_pane.col, Cursor_pane.row) + y_of_schema1(pane, pane.screen_top1)
--?         print(('display settings.y is now %d'):format(Display_settings.y))
        Surface.cursor_on_screen_check = true  -- cursor was on screen before keystroke, so it should remain on screen after
      end
      update_metadata(pane)
    end

Replacement in main.lua at line 732 [7.2]
B:BD[6.643] → [6.643:649]
B:BD[6.649] → [8.8:33]
B:BD[8.33] → [4.320:346]
∅:D[4.346] → [9.37:66]
B:BD[9.37] → [9.37:66]
```
  end
  if chord == 'C-e' then
    if pane.editable then
      command.exit_editing()
```
[6.643]
[9.66]
```
    if chord == 'C-e' then
      command.edit_note_at_cursor()
```

Replacement in main.lua at line 735 [7.2]

B:BD[9.75] → [9.75:119]

∅:D[10.79] → [11.279:296]

∅:D[9.119] → [11.279:296]

B:BD[11.279] → [11.279:296]

B:BD[11.296] → [4.347:371]

∅:D[4.371] → [12.1851:1910]

B:BD[11.323] → [12.1851:1910]

B:BD[12.1910] → [13.890:965]

∅:D[14.389] → [15.39:83]

∅:D[13.965] → [15.39:83]

∅:D[12.1910] → [15.39:83]

B:BD[11.323] → [15.39:83]

B:BD[15.83] → [13.966:1046]

B:BD[13.1046] → [3.524:713]

∅:D[16.54] → [13.1147:1258]

∅:D[3.713] → [13.1147:1258]

B:BD[13.1147] → [13.1147:1258]

B:BD[13.1353] → [13.1353:1553]

      command.edit_note_at_cursor()
    end
    return
  end
  if pane.editable then
--?     print(('%s pressed in editor pane'):format(chord))
    local old_top = {line=pane.screen_top1.line, pos=pane.screen_top1.pos}
    edit.keychord_pressed(pane, chord, key)
--?     print('screen top after:', pane.screen_top1.line, pane.screen_top1.pos)
    Editable_cursor_pane_updated_screen_top = not eq(old_top, pane.screen_top1)
    if Editable_cursor_pane_updated_screen_top then
--?       print('updating viewport based on screen top')
      Display_settings.y = up_edge_sy(Cursor_pane.col, Cursor_pane.row) + y_of_schema1(pane, pane.screen_top1)
--?       print(('display settings.y is now %d'):format(Display_settings.y))
      Surface.cursor_on_screen_check = true  -- cursor was on screen before keystroke, so it should remain on screen after

[9.75]

[13.1553]

      keychord_pressed_on_immutable_pane(pane, chord, key)

Deletion in main.lua at line 737 [7.2]
B:BD[13.1561] → [2.699:725]
∅:D[15.83] → [11.374:438]
∅:D[17.549] → [11.374:438]
∅:D[2.725] → [11.374:438]
∅:D[13.1561] → [11.374:438]
∅:D[12.2136] → [11.374:438]
B:BD[11.374] → [11.374:438]
```
    update_metadata(pane)
  else
    keychord_pressed_on_immutable_pane(pane, chord, key)
```