feat: allow defining overriding and removing keyboard shortcuts #99
Conversation
| #[serde(untagged)] | ||
| pub enum KeyDefinition { | ||
| Command(Command), | ||
| // TODO: minor mode |
There was a problem hiding this comment.
We'll want to flesh this out before merging. My goal is to be able to define the space menu as a minor mode rather than hard coding it, that way users are able to customize it to their liking (as well as to support future features like bookmark management)
| #[serde(untagged)] | ||
| pub enum Command { | ||
| Static(StaticCommand), | ||
| // TODO: typable commands |
There was a problem hiding this comment.
We'll want this fleshed out before merging as a base for future features.
| fn resolve_command(config: &Config, key: char) -> Option<Command> { | ||
| config | ||
| .keys | ||
| .change | ||
| .get(&key) | ||
| .map(|key_def| { | ||
| let KeyDefinition::Command(command) = key_def; | ||
| command | ||
| }) | ||
| .copied() | ||
| } | ||
|
|
||
| fn read_keys( | ||
| mut ev_selection: EventWriter<ChangeBufferSelectionEvent>, | ||
| mut change_buffer: Query<&mut ChangeBuffer>, | ||
| mut ev_keypresses: EventReader<KeyEvent>, | ||
| mut exit: EventWriter<AppExit>, | ||
| mut navigation: Navigation, | ||
| config: Res<Config>, |
There was a problem hiding this comment.
This isn't bad. I think a good next step is to extract this into its own event mapper (so that instead of listening to EventReader<KeyEvent> we can listen to e.g. EventReader<Command>.
| } | ||
|
|
||
| Some(Command::Static(StaticCommand::MoveVisualLineUp)) => { | ||
| Some(IndexSelection::Single(usize::min(i.wrapping_sub(1), max))) |
There was a problem hiding this comment.
Let's avoid wrapping selections. We'll add goto commands later on via minor modes, a la gg and ge
| } | ||
|
|
||
| Some(Command::Static(StaticCommand::ExtendLineUp)) => { | ||
| // TODO: I had a long day at work today - I have exactly zero clue what |
There was a problem hiding this comment.
(unresolving, as apparently i forgot to fix this 💀)
|
We'll also want to clean up commits before we merge 😁 |
scrabsha
force-pushed
the
push-yvvvvlsntxku
branch
from
2f30023 to
7adedce
Compare
| ExtendLineUp, | ||
|
|
||
| /// Does nothing. Allows to delete a binding. | ||
| #[serde(alias = "no_op")] |
There was a problem hiding this comment.
i'm not sure this alias is necessary (the snake_case of NoOp is... no_op)
Part of #95.
The title says everything. The implementation is a bit primitive and many things are missing, but that's something we can iterate on :)
For what it's worth, here's the content of my
.jj/repo/config.tomlnow:I cherry-picked commit 59fd346 which written by you (@icorbrey) and started working over it. I removed some things that were too complicated for a first MR. If that's ok for you, we could tackle them later.
For what it's worth, my experience with Bevy is exactly 0, so please report anything that does not look correct.