Git: Fix Linux bindings (#25486)
- Tooltip with binding wasn't showing up - Missing Linux bindings - Commit modal wasn't opening when binding was pressed Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
parent
b2921bd3fd
commit
ec7ce41324
2 changed files with 23 additions and 18 deletions
|
@ -368,7 +368,12 @@
|
||||||
"ctrl-\\": "pane::SplitRight",
|
"ctrl-\\": "pane::SplitRight",
|
||||||
"ctrl-k v": "markdown::OpenPreviewToTheSide",
|
"ctrl-k v": "markdown::OpenPreviewToTheSide",
|
||||||
"ctrl-shift-v": "markdown::OpenPreview",
|
"ctrl-shift-v": "markdown::OpenPreview",
|
||||||
"ctrl-alt-shift-c": "editor::DisplayCursorNames"
|
"ctrl-alt-shift-c": "editor::DisplayCursorNames",
|
||||||
|
"ctrl-alt-y": "git::ToggleStaged",
|
||||||
|
"alt-y": "git::StageAndNext",
|
||||||
|
"alt-shift-y": "git::UnstageAndNext",
|
||||||
|
"alt-.": "editor::GoToHunk",
|
||||||
|
"alt-,": "editor::GoToPrevHunk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -705,12 +710,6 @@
|
||||||
"space": "project_panel::Open"
|
"space": "project_panel::Open"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"context": "GitPanel && !CommitEditor",
|
|
||||||
"bindings": {
|
|
||||||
"escape": "git_panel::Close"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"context": "GitPanel && ChangesList",
|
"context": "GitPanel && ChangesList",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
|
@ -722,16 +721,24 @@
|
||||||
"ctrl-shift-space": "git::UnstageAll",
|
"ctrl-shift-space": "git::UnstageAll",
|
||||||
"tab": "git_panel::FocusEditor",
|
"tab": "git_panel::FocusEditor",
|
||||||
"shift-tab": "git_panel::FocusEditor",
|
"shift-tab": "git_panel::FocusEditor",
|
||||||
"escape": "git_panel::ToggleFocus"
|
"escape": "git_panel::ToggleFocus",
|
||||||
|
"ctrl-enter": "git::Commit"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "GitCommit > Editor",
|
||||||
|
"bindings": {
|
||||||
|
"enter": "editor::Newline",
|
||||||
|
"ctrl-enter": "git::Commit"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"context": "GitPanel > Editor",
|
"context": "GitPanel > Editor",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
"escape": "git_panel::FocusChanges",
|
"escape": "git_panel::FocusChanges",
|
||||||
"ctrl-enter": "git::Commit",
|
|
||||||
"tab": "git_panel::FocusChanges",
|
"tab": "git_panel::FocusChanges",
|
||||||
"shift-tab": "git_panel::FocusChanges",
|
"shift-tab": "git_panel::FocusChanges",
|
||||||
|
"ctrl-enter": "git::Commit",
|
||||||
"alt-up": "git_panel::FocusChanges"
|
"alt-up": "git_panel::FocusChanges"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -1059,17 +1059,15 @@ impl GitPanel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Commit all staged changes
|
|
||||||
fn commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
|
fn commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
|
||||||
let editor = self.commit_editor.read(cx);
|
if self
|
||||||
if editor.is_empty(cx) {
|
.commit_editor
|
||||||
if !editor.focus_handle(cx).contains_focused(window, cx) {
|
.focus_handle(cx)
|
||||||
editor.focus_handle(cx).focus(window);
|
.contains_focused(window, cx)
|
||||||
return;
|
{
|
||||||
}
|
self.commit_changes(window, cx)
|
||||||
}
|
}
|
||||||
|
cx.propagate();
|
||||||
self.commit_changes(window, cx)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn commit_changes(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
pub(crate) fn commit_changes(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue