diff options
| author | Aram Drevekenin <aram@poor.dev> | 2022-10-05 07:44:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 07:44:00 +0200 |
| commit | 79bf6ab868cbdab1f9a3827c9b70198f54548b44 (patch) | |
| tree | 2d6fc4c1d8a79ebd727a1a5f8b6406617dd0de55 /zellij-utils/src/snapshots | |
| parent | 917e9b2ff0f583183c0155060d243afd295770b9 (diff) | |
feat(config): switch to kdl (#1759)
* chore(config): default kdl keybindings config
* tests
* work
* refactor(config): move stuff around
* work
* tab merge layout
* work
* work
* layouts working
* work
* layout tests
* work
* work
* feat(parsing): kdl layouts without config
* refactor(kdl): move stuff around
* work
* tests(layout): add cases and fix bugs
* work
* fix(kdl): various bugs
* chore(layouts): move all layouts to kdl
* feat(kdl): shared keybidns
* fix(layout): do not count fixed panes toward percentile
* fix(keybinds): missing keybinds and actions
* fix(config): adjust default tips
* refactor(config): move stuff around
* fix(tests): make e2e tests pass
* fix(kdl): add verbose parsing errors
* fix(kdl): focused tab
* fix(layout): corret default_tab_template behavior
* style(code): fix compile warnings
* feat(cli): send actions through the cli
* fix(cli): exit only when action is done
* fix(cli): open embedded pane from floating pane
* fix(cli): send actions to other sessions
* feat(cli): command alias
* feat(converter): convert old config
* feat(converter): convert old layout and theme files
* feat(kdl): pretty errors
* feat(client): convert old YAML files on startup
* fix: various bugs and styling issues
* fix: e2e tests
* fix(screen): propagate errors after merge
* style(clippy): lower clippy level
* fix(tests): own session_name variable
* style(fmt): rustfmt
* fix(cli): various action fixes
* style(fmt): rustfmt
* fix(themes): loading of theme files
* style(fmt): rustfmt
* fix(tests): theme fixtures
* fix(layouts): better errors on unknown nodes
* fix(kdl): clarify valid node terminator error
* fix(e2e): adjust close tab test
* fix(e2e): adjust close tab test again
* style(code): cleanup some comments
Diffstat (limited to 'zellij-utils/src/snapshots')
13 files changed, 17516 insertions, 0 deletions
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap new file mode 100644 index 000000000..008014033 --- /dev/null +++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap @@ -0,0 +1,27 @@ +--- +source: zellij-utils/src/setup.rs +assertion_line: 561 +expression: "format!(\"{:#?}\", options)" +--- +Options { + simplified_ui: Some( + true, + ), + theme: None, + default_mode: None, + default_shell: None, + default_layout: None, + layout_dir: None, + theme_dir: None, + mouse_mode: None, + pane_frames: None, + mirror_session: None, + on_force_close: None, + scroll_buffer_size: None, + copy_command: None, + copy_clipboard: None, + copy_on_select: None, + scrollback_editor: None, + session_name: None, + attach_to_session: None, +} diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options-2.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options-2.snap new file mode 100644 index 000000000..263f3c608 --- /dev/null +++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options-2.snap @@ -0,0 +1,21 @@ +--- +source: zellij-utils/src/setup.rs +assertion_line: 509 +expression: "format!(\"{:#?}\", layout)" +--- +Layout { + tabs: [], + focused_tab_index: None, + template: Some( + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + ), +} diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap new file mode 100644 index 000000000..a36a7543f --- /dev/null +++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap @@ -0,0 +1,27 @@ +--- +source: zellij-utils/src/setup.rs +assertion_line: 584 +expression: "format!(\"{:#?}\", options)" +--- +Options { + simplified_ui: None, + theme: None, + default_mode: None, + default_shell: None, + default_layout: None, + layout_dir: None, + theme_dir: None, + mouse_mode: None, + pane_frames: Some( + true, + ), + mirror_session: None, + on_force_close: None, + scroll_buffer_size: None, + copy_command: None, + copy_clipboard: None, + copy_on_select: None, + scrollback_editor: None, + session_name: None, + attach_to_session: None, +} diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-2.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-2.snap new file mode 100644 index 000000000..d4ea72ea4 --- /dev/null +++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-2.snap @@ -0,0 +1,82 @@ +--- +source: zellij-utils/src/setup.rs +assertion_line: 492 +expression: "format!(\"{:#?}\", layout)" +--- +Layout { + tabs: [], + focused_tab_index: None, + template: Some( + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [ + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: Some( + Fixed( + 1, + ), + ), + run: Some( + Plugin( + RunPlugin { + _allow_exec_host_cmd: false, + location: Zellij( + PluginTag( + "tab-bar", + ), + ), + }, + ), + ), + borderless: true, + focus: None, + external_children_index: None, + }, + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + PaneLayout { + children_split_direction: Horizontal, + name: None, + children: [], + split_size: Some( + Fixed( + 2, + ), + ), + run: Some( + Plugin( + RunPlugin { + _allow_exec_host_cmd: false, + location: Zellij( + PluginTag( + "status-bar", + ), + ), + }, + ), + ), + borderless: true, + focus: None, + external_children_index: None, + }, + ], + split_size: None, + run: None, + borderless: false, + focus: None, + external_children_index: None, + }, + ), +} diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap new file mode 100644 index 000000000..e23c0d246 --- /dev/null +++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap @@ -0,0 +1,25 @@ +--- +source: zellij-utils/src/setup.rs +assertion_line: 546 +expression: "format!(\"{:#?}\", options)" +--- +Options { + simplified_ui: None, + theme: None, + default_mode: None, + default_shell: None, + default_layout: None, + layout_dir: None, + theme_dir: None, + mouse_mode: None, + pane_frames: None, + mirror_session: None, + on_force_close: None, + scroll_buffer_size: None, + copy_command: None, + copy_clipboard: None, + copy_on_select: None, + scrollback_editor: None, + session_name: None, + attach_to_session: None, +} diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap new file mode 100644 index 000000000..35cd5f7e0 --- /dev/null +++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap @@ -0,0 +1,3363 @@ +--- +source: zellij-utils/src/setup.rs +assertion_line: 491 +expression: "format!(\"{:#?}\", config)" +--- +Config { + keybinds: { + Normal: { + Alt( + Char( + '+', + ), + ): [ + Resize( + Increase, + ), + ], + Alt( + Char( + '-', + ), + ): [ + Resize( + Decrease, + ), + ], + Alt( + Char( + '=', + ), + ): [ + Resize( + Increase, + ), + ], + Alt( + Char( + 'h', + ), + ): [ + MoveFocusOrTab( + Left, + ), + ], + Alt( + Char( + 'j', + ), + ): [ + MoveFocus( + Down, + ), + ], + Alt( + Char( + 'k', + ), + ): [ + MoveFocus( + Up, + ), + ], + Alt( + Char( + 'l', + ), + ): [ + MoveFocusOrTab( + Right, + ), + ], + Alt( + Char( + 'n', + ), + ): [ + NewPane( + None, + ), + ], + Alt( + Direction( + Left, + ), + ): [ + MoveFocusOrTab( + Left, + ), + ], + Alt( + Direction( + Right, + ), + ): [ + MoveFocusOrTab( + Right, + ), + ], + Alt( + Direction( + Up, + ), + ): [ + MoveFocus( + Up, + ), + ], + Alt( + Direction( + Down, + ), + ): [ + MoveFocus( + Down, + ), + ], + Ctrl( + 'b', + ): [ + SwitchToMode( + Tmux, + ), + ], + Ctrl( + 'g', + ): [ + SwitchToMode( + Locked, + ), + ], + Ctrl( + 'h', + ): [ + SwitchToMode( + Move, + ), + ], + Ctrl( + 'n', + ): [ + SwitchToMode( + Resize, + ), + ], + Ctrl( + 'o', + ): [ + SwitchToMode( + Session, + ), + ], + Ctrl( + 'p', + ): [ + SwitchToMode( + Pane, + ), + ], + Ctrl( + 'q', + ): [ + Quit, + ], + Ctrl( + 's', + ): [ + SwitchToMode( + Scroll, + ), + ], + Ctrl( + 't', + ): [ + SwitchToMode( + Tab, + ), + ], + }, + Locked: { + Ctrl( + 'g', + ): [ + SwitchToMode( + Normal, + ), + ], + }, + Resize: { + Left: [ + Resize( + Left, + ), + ], + Down: [ + Resize( + Down, + ), + ], + Up: [ + Resize( + Up, + ), + ], + Right: [ + Resize( + Right, + ), + ], + Char( + '\n', + ): [ + SwitchToMode( + Normal, + ), + ], + Char( + ' ', + ): [ + SwitchToMode( + Normal, + ), + ], + Char( + '+', + ): [ + Resize( + Increase, + ), + ], + Char( + '-', + ): [ + Resize( + Decrease, + ), + ], + Char( + '=', + ): [ + Resize( + Increase, + ), + ], + Char( + 'h', + ): [ + Resize( + Left, + ), + ], + Char( + 'j', + ): [ + Resize( + Down, + ), + ], + Char( + 'k', + ): [ + Resize( + Up, + ), + ], + Char( + 'l', + ): [ + Resize( + Right, + ), + ], + Alt( + Char( + '+', + ), + ): [ + Resize( + Increase, + ), + ], + Alt( + Char( + '-', + ), + ): [ + Resize( + Decrease, + ), + ], + Alt( + Char( + '=', + ), + ): [ + Resize( + Increase, + ), + ], + Alt( + Char( + 'h', + ), + ): [ + MoveFocusOrTab( + Left, + ), + ], + Alt( + Char( + 'j', + ), + ): [ + MoveFocus( + Down, + ), + ], + Alt( + Char( + 'k', + ), + ): [ + MoveFocus( + Up, + ), + ], + Alt( + Char( + 'l', + ), + ): [ + MoveFocusOrTab( + Right, + ), + ], + Alt( + Char( + 'n', + ), + ): [ + NewPane( + None, + ), + ], + Alt( + Direction( + Left, + ), + ): [ + MoveFocusOrTab( + Left, + ), + ], + Alt( + Direction( + Right, + ), + ): [ + MoveFocusOrTab( + Right, + ), + ], + Alt( + Direction( + Up, + ), + ): [ + MoveFocus( + Up, + ), + ], + Alt( + Direction( + Down, + ), + ): [ + MoveFocus( + Down, + ), + ], + Ctrl( + 'b', + ): [ + SwitchToMode( + Tmux, + ), + ], + Ctrl( + 'g', + ): [ + SwitchToMode( + Locked, + ), + ], + Ctrl( + 'h', + ): [ + SwitchToMode( + Move, + ), + ], + Ctrl( + 'n', + ): [ + SwitchToMode( + Normal, + ), + ], + Ctrl( + 'o', + ): [ + SwitchToMode( + Session, + ), + ], + Ctrl( + 'p', + ): [ + SwitchToMode( + Pane, + ), + ], + Ctrl( + 'q', + ): [ + Quit, + ], + Ctrl( + 's', + ): [ + SwitchToMode( + Scroll, + ), + ], + Ctrl( + 't', + ): [ + SwitchToMode( + Tab, + ), + ], + Esc: [ + SwitchToMode( + Normal, + ), + ], + }, + Pane: { + Left: [ + MoveFocus( + Left, + ), + ], + Down: [ + MoveFocus( + Down, + ), + ], + Up: [ + MoveFocus( + Up, + ), + ], + Right: [ + MoveFocus( + Right, + ), + ], + Char( + '\n', + ): [ + SwitchToMode( + Normal, + ), + ], + Char( + ' ', + ): [ + SwitchToMode( + Normal, + ), + ], + Char( + 'c', + ): [ + SwitchToMode( + RenamePane, + ), + PaneNameInput( + [ + 0, + ], + ), + ], + Char( + 'd', + ): [ + NewPane( + Some( + Down, + ), + ), + SwitchToMode( + Normal, + |