Merge branch 'master' into zig-0.14

This commit is contained in:
CJ van den Berg 2025-02-13 21:07:49 +01:00
commit 64ccbd3c14
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 203 additions and 11 deletions

View file

@ -20,8 +20,8 @@
["s", ["cut_forward_internal"], ["enter_mode", "insert"]],
["u", "undo"],
["j", "move_down"],
["k", "move_up"],
["j", "move_down_vim"],
["k", "move_up_vim"],
["l", "move_right_vim"],
["h", "move_left_vim"],
["<Space>", "move_right_vim"],
@ -33,15 +33,20 @@
["o", ["smart_insert_line_after"], ["enter_mode", "insert"]],
["O", ["smart_insert_line_before"], ["enter_mode", "insert"]],
["<S-.><S-.>", "indent"],
["<S-,><S-,>", "unindent"],
["v", "enter_mode", "visual"],
["V", ["move_begin"], ["enter_mode", "visual"], ["select_end"]],
["V", ["enter_mode", "visual line"], ["select_line_vim"]],
["n", "goto_next_match"],
["0", "move_begin"],
["^", "smart_move_begin"],
["$", "move_end"],
[":", "open_command_palette"],
["p", "paste_internal_vim"],
["P", "paste_internal_vim"],
["gd", "goto_definition"],
["gi", "goto_implementation"],
@ -51,16 +56,25 @@
["gD", "goto_declaration"],
["G", "move_buffer_end"],
["d$", "delete_to_end"],
["d$", "cut_to_end_vim"],
["dw", "cut_word_right_vim"],
["db", "cut_word_left_vim"],
["dd", "cut_internal_vim"],
["\"_dd", "delete_line"],
["cc", ["cut_internal_vim"], ["enter_mode", "insert"]],
["C", ["cut_to_end_vim"], ["enter_mode", "insert"]],
["D", "cut_to_end_vim"],
["cw", ["cut_word_right_vim"], ["enter_mode", "insert"]],
["cb", ["cut_word_left_vim"], ["enter_mode", "insert"]],
["yy", ["copy_line_internal_vim"], ["cancel"]],
["<C-u>", "move_scroll_page_up"],
["<C-d>", "move_scroll_page_down"],
["<C-u>", "move_scroll_half_page_up_vim"],
["<C-d>", "move_scroll_half_page_down_vim"],
["zz", "scroll_view_center"],
["u", "undo"],
["<C-r>", "redo"],
["<C-o>", "jump_back"],
@ -83,17 +97,77 @@
"cursor": "block",
"selection": "normal",
"press": [
["<Esc>", "enter_mode", "normal"],
["<Esc>", ["cancel"], ["enter_mode", "normal"]],
["k", "select_up"],
["j", "select_down"],
["h", "select_left"],
["l", "select_right"],
["b", "select_word_left_vim"],
["w", "select_word_right_vim"],
["W", "select_word_right"],
["B", "select_word_left"],
["e", "select_word_right_end_vim"],
["0", "move_begin"],
["^", "smart_move_begin"],
["$", "move_end"],
["p", ["paste_internal_vim"], ["enter_mode", "normal"]],
["P", ["paste_internal_vim"], ["enter_mode", "normal"]],
["<C-u>", "move_scroll_half_page_up_vim"],
["<C-d>", "move_scroll_half_page_down_vim"],
["zz", "scroll_view_center"],
["<S-.>", "indent"],
["<S-,>", "unindent"],
["y", ["copy_internal_vim"], ["cancel"], ["enter_mode", "normal"]],
["x", ["cut_forward_internal"], ["cancel"], ["enter_mode", "normal"]],
["d", ["cut_forward_internal"], ["cancel"], ["enter_mode", "normal"]],
["s", ["cut_forward_internal"], ["cancel"], ["enter_mode", "insert"]]
["x", ["cut_forward_internal"], ["enter_mode", "normal"]],
["d", ["cut_forward_internal"], ["enter_mode", "normal"]],
["s", ["cut_forward_internal"], ["enter_mode", "insert"]],
["c", ["cut_forward_internal"], ["enter_mode", "insert"]],
["C", ["cut_to_end_vim"], ["enter_mode", "insert"]],
["D", "cut_to_end_vim"]
]
},
"visual line": {
"syntax": "vim",
"on_match_failure": "ignore",
"name": "VISUAL LINE",
"line_numbers": "relative",
"cursor": "block",
"selection": "normal",
"press": [
["<Esc>", ["cancel"], ["enter_mode", "normal"]],
["k", "select_up"],
["j", "select_down"],
["0", "move_begin"],
["^", "smart_move_begin"],
["$", "move_end"],
["p", ["paste_internal_vim"], ["enter_mode", "normal"]],
["P", ["paste_internal_vim"], ["enter_mode", "normal"]],
["<C-u>", "move_scroll_half_page_up_vim"],
["<C-d>", "move_scroll_half_page_down_vim"],
["<S-.>", "indent"],
["<S-,>", "unindent"],
["y", ["copy_line_internal_vim"], ["cancel"], ["enter_mode", "normal"]],
["x", ["cut_internal_vim"], ["enter_mode", "normal"]],
["d", ["cut_internal_vim"], ["enter_mode", "normal"]],
["s", ["cut_internal_vim"], ["enter_mode", "insert"]],
["c", ["cut_internal_vim"], ["enter_mode", "insert"]],
["C", ["cut_to_end_vim"], ["enter_mode", "insert"]],
["D", "cut_to_end_vim"]
]
},
"insert": {
@ -102,7 +176,7 @@
"line_numbers": "absolute",
"cursor": "beam",
"press": [
["<Esc>", "enter_mode", "normal"],
["<Esc>", ["move_left_vim"], ["enter_mode", "normal"]],
["<Del>", "delete_forward"],
["<BS>", "delete_backward"],
["<CR>", "smart_insert_line"],