mirror of
https://github.com/zed-industries/zed.git
synced 2024-11-08 07:35:01 +03:00
vim: Add more diff stuff (#17456)
Release Notes: - vim: Added `:diff` and `:revert` (that work with `'<,'>`) to open the selected diff and revert it. - vim: Added `d o` to open the diff and `d p` to revert (spiritually similar to vim's do/dp, though obviously not the same) - vim: Added `ctrl-p` and `ctrl-n` to summon the autocomplete menu in insert mode.
This commit is contained in:
parent
5f2a5ffadd
commit
6af5fdd1c2
@ -323,6 +323,8 @@
|
|||||||
"ctrl-t": "vim::Indent",
|
"ctrl-t": "vim::Indent",
|
||||||
"ctrl-d": "vim::Outdent",
|
"ctrl-d": "vim::Outdent",
|
||||||
"ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
|
"ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
|
||||||
|
"ctrl-p": "editor::ShowCompletions",
|
||||||
|
"ctrl-n": "editor::ShowCompletions",
|
||||||
"ctrl-r": ["vim::PushOperator", "Register"]
|
"ctrl-r": ["vim::PushOperator", "Register"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -394,7 +396,9 @@
|
|||||||
"context": "vim_operator == d",
|
"context": "vim_operator == d",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
"d": "vim::CurrentLine",
|
"d": "vim::CurrentLine",
|
||||||
"s": ["vim::PushOperator", "DeleteSurrounds"]
|
"s": ["vim::PushOperator", "DeleteSurrounds"],
|
||||||
|
"o": "editor::ToggleHunkDiff", // "d o"
|
||||||
|
"p": "editor::RevertSelectedHunks" // "d p"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -586,6 +586,8 @@ fn generate_commands(_: &AppContext) -> Vec<VimCommand> {
|
|||||||
VimCommand::new(("lp", "revious"), editor::actions::GoToPrevDiagnostic).count(),
|
VimCommand::new(("lp", "revious"), editor::actions::GoToPrevDiagnostic).count(),
|
||||||
VimCommand::new(("lN", "ext"), editor::actions::GoToPrevDiagnostic).count(),
|
VimCommand::new(("lN", "ext"), editor::actions::GoToPrevDiagnostic).count(),
|
||||||
VimCommand::new(("j", "oin"), JoinLines).range(),
|
VimCommand::new(("j", "oin"), JoinLines).range(),
|
||||||
|
VimCommand::new(("dif", "fupdate"), editor::actions::ToggleHunkDiff).range(),
|
||||||
|
VimCommand::new(("rev", "ert"), editor::actions::RevertSelectedHunks).range(),
|
||||||
VimCommand::new(("d", "elete"), VisualDeleteLine).range(),
|
VimCommand::new(("d", "elete"), VisualDeleteLine).range(),
|
||||||
VimCommand::new(("y", "ank"), VisualYankLine).range(),
|
VimCommand::new(("y", "ank"), VisualYankLine).range(),
|
||||||
VimCommand::new(("sor", "t"), SortLinesCaseSensitive).range(),
|
VimCommand::new(("sor", "t"), SortLinesCaseSensitive).range(),
|
||||||
|
Loading…
Reference in New Issue
Block a user