macos: Keybind improvements for binds involving shift (#21207)
Fix cmd-pipe Remove redudnant jetbrains/sublime keybinds (these exist as `cmd-{` and `cmd-}` under default vscode keymap) and were broken as part of the recent keybind changes. Remove excess JSON whitespace from tests to make them more readable.
This commit is contained in:
parent
9999c31859
commit
fdc17c57d7
2 changed files with 15 additions and 75 deletions
|
@ -355,7 +355,7 @@
|
||||||
"alt-cmd-f12": "editor::GoToTypeDefinitionSplit",
|
"alt-cmd-f12": "editor::GoToTypeDefinitionSplit",
|
||||||
"alt-shift-f12": "editor::FindAllReferences",
|
"alt-shift-f12": "editor::FindAllReferences",
|
||||||
"ctrl-m": "editor::MoveToEnclosingBracket",
|
"ctrl-m": "editor::MoveToEnclosingBracket",
|
||||||
"cmd-shift-\\": "editor::MoveToEnclosingBracket",
|
"cmd-|": "editor::MoveToEnclosingBracket",
|
||||||
"alt-cmd-[": "editor::Fold",
|
"alt-cmd-[": "editor::Fold",
|
||||||
"alt-cmd-]": "editor::UnfoldLines",
|
"alt-cmd-]": "editor::UnfoldLines",
|
||||||
"cmd-k cmd-l": "editor::ToggleFold",
|
"cmd-k cmd-l": "editor::ToggleFold",
|
||||||
|
|
|
@ -3190,12 +3190,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/settings.json".as_ref(),
|
"/settings.json".as_ref(),
|
||||||
&r#"
|
&r#"{"base_keymap": "Atom"}"#.into(),
|
||||||
{
|
|
||||||
"base_keymap": "Atom"
|
|
||||||
}
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3205,16 +3200,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/keymap.json".as_ref(),
|
"/keymap.json".as_ref(),
|
||||||
&r#"
|
&r#"[{"bindings": {"backspace": "test1::A"}}]"#.into(),
|
||||||
[
|
|
||||||
{
|
|
||||||
"bindings": {
|
|
||||||
"backspace": "test1::A"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3257,16 +3243,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/keymap.json".as_ref(),
|
"/keymap.json".as_ref(),
|
||||||
&r#"
|
&r#"[{"bindings": {"backspace": "test1::B"}}]"#.into(),
|
||||||
[
|
|
||||||
{
|
|
||||||
"bindings": {
|
|
||||||
"backspace": "test1::B"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3286,12 +3263,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/settings.json".as_ref(),
|
"/settings.json".as_ref(),
|
||||||
&r#"
|
&r#"{"base_keymap": "JetBrains"}"#.into(),
|
||||||
{
|
|
||||||
"base_keymap": "JetBrains"
|
|
||||||
}
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3318,24 +3290,20 @@ mod tests {
|
||||||
// From the Atom keymap
|
// From the Atom keymap
|
||||||
use workspace::ActivatePreviousPane;
|
use workspace::ActivatePreviousPane;
|
||||||
// From the JetBrains keymap
|
// From the JetBrains keymap
|
||||||
use pane::ActivatePrevItem;
|
use diagnostics::Deploy;
|
||||||
|
|
||||||
workspace
|
workspace
|
||||||
.update(cx, |workspace, _| {
|
.update(cx, |workspace, _| {
|
||||||
workspace
|
workspace.register_action(|_, _: &A, _cx| {});
|
||||||
.register_action(|_, _: &A, _| {})
|
workspace.register_action(|_, _: &B, _cx| {});
|
||||||
.register_action(|_, _: &B, _| {});
|
workspace.register_action(|_, _: &Deploy, _cx| {});
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
app_state
|
app_state
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/settings.json".as_ref(),
|
"/settings.json".as_ref(),
|
||||||
&r#"
|
&r#"{"base_keymap": "Atom"}"#.into(),
|
||||||
{
|
|
||||||
"base_keymap": "Atom"
|
|
||||||
}
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3344,16 +3312,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/keymap.json".as_ref(),
|
"/keymap.json".as_ref(),
|
||||||
&r#"
|
&r#"[{"bindings": {"backspace": "test2::A"}}]"#.into(),
|
||||||
[
|
|
||||||
{
|
|
||||||
"bindings": {
|
|
||||||
"backspace": "test2::A"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3391,16 +3350,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/keymap.json".as_ref(),
|
"/keymap.json".as_ref(),
|
||||||
&r#"
|
&r#"[{"bindings": {"backspace": null}}]"#.into(),
|
||||||
[
|
|
||||||
{
|
|
||||||
"bindings": {
|
|
||||||
"backspace": null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3420,12 +3370,7 @@ mod tests {
|
||||||
.fs
|
.fs
|
||||||
.save(
|
.save(
|
||||||
"/settings.json".as_ref(),
|
"/settings.json".as_ref(),
|
||||||
&r#"
|
&r#"{"base_keymap": "JetBrains"}"#.into(),
|
||||||
{
|
|
||||||
"base_keymap": "JetBrains"
|
|
||||||
}
|
|
||||||
"#
|
|
||||||
.into(),
|
|
||||||
Default::default(),
|
Default::default(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -3433,12 +3378,7 @@ mod tests {
|
||||||
|
|
||||||
cx.background_executor.run_until_parked();
|
cx.background_executor.run_until_parked();
|
||||||
|
|
||||||
assert_key_bindings_for(
|
assert_key_bindings_for(workspace.into(), cx, vec![("6", &Deploy)], line!());
|
||||||
workspace.into(),
|
|
||||||
cx,
|
|
||||||
vec![("[", &ActivatePrevItem)],
|
|
||||||
line!(),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[gpui::test]
|
#[gpui::test]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue