Skip to content

Update file vs folder open keymaps on macOS/linux to match Windows#44598

Merged
Veykril merged 4 commits intozed-industries:mainfrom
Zachiah:ZS/update-file-vs-folder-open-keymaps
Dec 11, 2025
Merged

Update file vs folder open keymaps on macOS/linux to match Windows#44598
Veykril merged 4 commits intozed-industries:mainfrom
Zachiah:ZS/update-file-vs-folder-open-keymaps

Conversation

@Zachiah
Copy link
Collaborator

@Zachiah Zachiah commented Dec 11, 2025

Closes #44597

Matches what was done here:
55dfbac#diff-cc832e840d61526768bb4acec7645a71e8b160a65a30e7ce9e9c51762b58199a

Release Notes:

  • Standardize Cmd-O = open file, Cmd-K Cmd-O = open folder across operating systems.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 11, 2025
Comment on lines +37 to +38
"cmd-o": "workspace::Open",
"cmd-o": "workspace::OpenFiles",
"cmd-k cmd-o": "workspace::Open",
Copy link
Member

Choose a reason for hiding this comment

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

It seems vscode only has cmd-o for open, so this change should not be made here given the default keymap is vscode specific

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Should I remove the cmd-k cmd-o from Windows as well or just the 2 I added?

Copy link
Member

Choose a reason for hiding this comment

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

No windows is correct. Its just on mac where these differ weirdly enough (and I presume linux uses the same as windows here, so that change should check out)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

OK done. For future would it have been preferable to amend it? I definitely would have on a lot of projects but I like to ask because I don't want to make people review changes twice if they don't want to no matter how small. Like, as a zed culture thing if I make a tiny PR and have to make a change should I amend if it makes sense, or always make a new commit?

Copy link
Member

Choose a reason for hiding this comment

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

Committing is probably preferred as we do squash merges, so it will ultimately end up as a single commit anyways

@Veykril Veykril self-assigned this Dec 11, 2025
Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
@Veykril Veykril marked this pull request as ready for review December 11, 2025 09:26
@Veykril Veykril enabled auto-merge (squash) December 11, 2025 09:26
@Veykril
Copy link
Member

Veykril commented Dec 11, 2025

Thanks!

@maxdeviant maxdeviant changed the title Update file vs folder open keymaps on macos/linux to match windows Update file vs folder open keymaps on macOS/linux to match Windows Dec 11, 2025
@Zachiah
Copy link
Collaborator Author

Zachiah commented Dec 11, 2025

Thank you! By the way, what would it take to get traige? I'd really enjoy tagging issues.

@Veykril Veykril merged commit 9c099e7 into zed-industries:main Dec 11, 2025
37 of 39 checks passed
nrbnlulu pushed a commit to nrbnlulu/zed that referenced this pull request Dec 14, 2025
…ed-industries#44598)

Closes zed-industries#44597

Matches what was done here:

zed-industries@55dfbac#diff-cc832e840d61526768bb4acec7645a71e8b160a65a30e7ce9e9c51762b58199a

Release Notes:

- Standardize Cmd-O = open file, Cmd-K Cmd-O = open folder across
operating systems.

---------

Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
…ed-industries#44598)

Closes zed-industries#44597

Matches what was done here:

zed-industries@55dfbac#diff-cc832e840d61526768bb4acec7645a71e8b160a65a30e7ce9e9c51762b58199a

Release Notes:

- Standardize Cmd-O = open file, Cmd-K Cmd-O = open folder across
operating systems.

---------

Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
someone13574 pushed a commit to someone13574/zed that referenced this pull request Dec 16, 2025
…ed-industries#44598)

Closes zed-industries#44597

Matches what was done here:

zed-industries@55dfbac#diff-cc832e840d61526768bb4acec7645a71e8b160a65a30e7ce9e9c51762b58199a

Release Notes:

- Standardize Cmd-O = open file, Cmd-K Cmd-O = open folder across
operating systems.

---------

Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
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.

[linux] Ctrl+O opens directory picker instead of the file one

2 participants