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.

Sign up for GitHub

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

Jump to bottom

fix: allow to parse "-" as a key code #12191

Merged
merged 6 commits into from
Dec 6, 2024
Merged

fix: allow to parse "-" as a key code #12191

merged 6 commits into from
Dec 6, 2024

Conversation

tzemanovic
Copy link
Contributor

closes #12190

@the-mikedavis
Copy link
Member

Parsing - is ok (also see #8475 which accepts it for macros) but I'd like to continue rejecting <Mod>-- since it's not very readable.

@tzemanovic
Copy link
Contributor Author

Parsing - is ok (also see #8475 which accepts it for macros) but I'd like to continue rejecting <Mod>-- since it's not very readable.

sounds good, thanks! I made the change

the-mikedavis
the-mikedavis reviewed Dec 5, 2024
View reviewed changes
helix-view/src/input.rs Outdated Show resolved Hide resolved
helix-view/src/input.rs Outdated Show resolved Hide resolved
tzemanovic and others added 2 commits December 6, 2024 10:09
@tzemanovic
fixup! only allow to use '-' key code without modifiers
bab1254
@the-mikedavis
minor style edits
89857ae 
* We should keep the `tokens.last()` checking in the `match` branch: it
  ensures that we only take this branch if `s` ends with `--` or is `-`.
  Without it this branch would also apply to `S-` for example.
* I've switched the string stuff to `trim_end_matches`. That should
  cover other odd cases like `S---`.
* Instead of popping or clearing the `tokens` we can return early since
  there isn't any work to do parsing modifiers for `'-'`.
@the-mikedavis the-mikedavis merged commit fc9968b into helix-editor:master Dec 6, 2024
@nik-rev nik-rev mentioned this pull request Dec 14, 2024
Merged
CedricMeu pushed a commit to CedricMeu/helix that referenced this pull request Jan 2, 2025
@tzemanovic @the-mikedavis
fix: allow to parse "-" as a key code (helix-editor#12191)
78a8224 
Co-authored-by: Michael Davis <[email protected]>
GladkihEgor pushed a commit to GladkihEgor/helix that referenced this pull request Jan 4, 2025
@tzemanovic @the-mikedavis @GladkihEgor
fix: allow to parse "-" as a key code (helix-editor#12191)
d91e21b 
Co-authored-by: Michael Davis <[email protected]>
diucicd pushed a commit to diucicd/helix that referenced this pull request Jan 8, 2025
@tzemanovic @the-mikedavis @rongyi
fix: allow to parse "-" as a key code (helix-editor#12191)
693e9c3 
Co-authored-by: Michael Davis <[email protected]>
rmburg pushed a commit to rmburg/helix that referenced this pull request Jan 20, 2025
@tzemanovic @the-mikedavis @rmburg
fix: allow to parse "-" as a key code (helix-editor#12191)
e3d0d5b 
Co-authored-by: Michael Davis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@the-mikedavis the-mikedavis the-mikedavis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Invalid key code when mapping "-"
2 participants
@tzemanovic @the-mikedavis