Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keymap changes for editor::JoinLines #14136

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Keymap changes for editor::JoinLines #14136

merged 2 commits into from
Jul 11, 2024

Conversation

notpeter
Copy link
Member

@notpeter notpeter commented Jul 11, 2024

  • Linux (default) add ctrl-shift-j
  • Linux (default) remove ctrl-j
    • Conflicted with: "ctrl-j": "workspace::ToggleBottomDock",
  • MacOS (sublime) add cmd-shift-j

JetBrains/Sublime on Windows/Linux already use ctrl-shift-j

Reported here:

Release Notes:

  • Keymap: Move editor::JoinLines to ctrl-shift-j (Linux)

- Linux remove ctrl-j
- Linux add ctrl-shift-j
- MacOS add cmd-shift-j
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jul 11, 2024
Comment on lines 434 to 435
"ctrl-j": "editor::JoinLines",
"cmd-shift-j": "editor::JoinLines",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a Mac user so these might be the norm, but they do stand out as dupes.

Copy link
Member Author

@notpeter notpeter Jul 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did some archeology and I think you're right.
Adding cmd-shift-j to the Sublime-Mac keybind.

Sublime Linux Default Keymap (2024)

{ "keys": ["ctrl+shift+j"], "command": "join_lines" },

Sublime MacOS Default Keymap (2024)

{ "keys": ["super+shift+j"], "command": "join_lines" },

Atom MacOS

'cmd-j': 'editor:join-lines'

Atom Linux

'ctrl-j': 'editor:join-lines'

VSCode Mac
Screenshot 2024-07-11 at 1 01 34

JetBrain MacOS
image

JetBrains Windows/Linux
Screenshot 2024-07-11 at 0 12 37

Earlier atom used meta-j (alt-j) and emacs uses M-^ for join-line.

@notpeter notpeter merged commit de78eb4 into main Jul 11, 2024
10 checks passed
@notpeter notpeter deleted the linux_ctrl_j branch July 11, 2024 15:14
@notpeter
Copy link
Member Author

/cherry-pick v0.144.x

1 similar comment
@maxdeviant
Copy link
Member

/cherry-pick v0.144.x

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jul 11, 2024
- Linux (default) add ctrl-shift-j
- Linux (default) remove ctrl-j
  - Conflicted with: `"ctrl-j": "workspace::ToggleBottomDock",`
- MacOS (sublime) add cmd-shift-j
notpeter pushed a commit that referenced this pull request Jul 11, 2024
Cherry-picked Keymap changes for `editor::JoinLines` (#14136)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants