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

Fix overrides.json not working for shortcuts #15716

Merged
merged 4 commits into from
Jan 31, 2024

Conversation

krassowski
Copy link
Member

@krassowski krassowski commented Jan 30, 2024

References

Fixes #15713

Code changes

  • add test ensuring that the default settings (such as from overrides.json) are respected - it should fail in the first second commit (it seems this test group was not run on CI, second commit fixes it)
  • fix the overrides getting lost

User-facing changes

Shortcuts modifications defined in overrides.json now work.

Backwards-incompatible changes

None

@krassowski krassowski added the bug label Jan 30, 2024
@krassowski krassowski added this to the 4.0.x milestone Jan 30, 2024
Copy link

Thanks for making a pull request to jupyterlab!
To try out this branch on binder, follow this link: Binder

@krassowski
Copy link
Member Author

This test is now executed correctly on CI:

image

@krassowski krassowski marked this pull request as ready for review January 31, 2024 09:57
Copy link
Member

@jtpio jtpio left a comment

Choose a reason for hiding this comment

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

Thanks!

@jtpio jtpio merged commit 63651b4 into jupyterlab:main Jan 31, 2024
78 checks passed
@jtpio
Copy link
Member

jtpio commented Jan 31, 2024

@meeseeksdev please backport to 4.0.x

Copy link

lumberbot-app bot commented Jan 31, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 4.0.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 63651b410191e61fea57068818c250727dd28e8b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #15716: Fix `overrides.json` not working for shortcuts'
  1. Push to a named branch:
git push YOURFORK 4.0.x:auto-backport-of-pr-15716-on-4.0.x
  1. Create a PR against branch 4.0.x, I would have named this PR:

"Backport PR #15716 on branch 4.0.x (Fix overrides.json not working for shortcuts)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Overrides.json is not respected by the keyboard shortcuts extensions
2 participants