alex/muda
1
0
Fork 0
mirror of https://github.com/italicsjenga/muda.git synced 2025-01-14 05:36:11 +11:00
Code Issues Packages Projects Releases Wiki Activity

fix: parse one letter string to valid accelerator (#28)

Browse source 
* fix: parse one letter string to valid accelerator

* clippy
This commit is contained in:
Amr Bashir 2022-12-20 00:55:57 +02:00 committed by GitHub
parent 0b0ec147bc
commit 0173987ed5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changes/one-letter-accel.md Normal file
View file

@ -0,0 +1,5 @@
---
"muda": "patch"
---
Fix parsing one letter string as valid accelerator without modifiers.

39
src/accelerator.rs
View file

@ -77,6 +77,29 @@ fn parse_accelerator(accelerator_string: &str) -> crate::Result<Accelerator> {
let mut mods = Modifiers::empty(); let mut mods = Modifiers::empty();
let mut key = Code::Unidentified; let mut key = Code::Unidentified;
let mut split = accelerator_string.split('+');
let len = split.clone().count();
let parse_key = |token: &str| -> crate::Result<Code> {
if let Ok(code) = Code::from_str(token) {
match code {
Code::Unidentified => Err(crate::Error::AcceleratorParseError(format!(
"Couldn't identify \"{}\" as a valid `Code`",
token
))),
_ => Ok(code),
}
} else {
Err(crate::Error::AcceleratorParseError(format!(
"Couldn't identify \"{}\" as a valid `Code`",
token
)))
}
};
if len == 1 {
let token = split.next().unwrap();
key = parse_key(token)?;
} else {
for raw in accelerator_string.split('+') { for raw in accelerator_string.split('+') {
let token = raw.trim().to_string(); let token = raw.trim().to_string();
if token.is_empty() { if token.is_empty() {
@ -117,21 +140,7 @@ fn parse_accelerator(accelerator_string: &str) -> crate::Result<Accelerator> {
mods.set(Modifiers::CONTROL, true); mods.set(Modifiers::CONTROL, true);
} }
_ => { _ => {
if let Ok(code) = Code::from_str(token.as_str()) { key = parse_key(token.as_str())?;
match code {
Code::Unidentified => {
return Err(crate::Error::AcceleratorParseError(format!(
"Couldn't identify \"{}\" as a valid `Code`",
token
)))
}
_ => key = code,
}
} else {
return Err(crate::Error::AcceleratorParseError(format!(
"Couldn't identify \"{}\" as a valid `Code`",
token
)));
} }
} }
} }