mirror of https://github.com/helix-editor/helix
Fix previous broken refactor key into helix-view
Need to be used for autoinfo
Revert "Revert "Refactor key into helix-view""
This reverts commit 10f9f72232.
pull/371/head
Ivan Tham
3 years ago
committed by
Blaž Hrastnik
parent
15ae2e7ef1
commit
10548bf0e3
@ -1,47 +1,62 @@
|
|||||||
use anyhow::{Error, Result};
|
use anyhow::{Error, Result};
|
||||||
|
use serde::Deserialize;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use serde::{de::Error as SerdeError, Deserialize, Serialize};
|
use crate::commands::Command;
|
||||||
|
use crate::keymap::Keymaps;
|
||||||
|
|
||||||
use crate::keymap::{parse_keymaps, Keymaps};
|
#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
|
||||||
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
pub theme: Option<String>,
|
pub theme: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
pub lsp: LspConfig,
|
pub lsp: LspConfig,
|
||||||
pub keymaps: Keymaps,
|
#[serde(default)]
|
||||||
|
pub keys: Keymaps,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Serialize, Deserialize)]
|
#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
|
||||||
#[serde(rename_all = "kebab-case")]
|
#[serde(rename_all = "kebab-case")]
|
||||||
pub struct LspConfig {
|
pub struct LspConfig {
|
||||||
pub display_messages: bool,
|
pub display_messages: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[test]
|
||||||
#[serde(rename_all = "kebab-case")]
|
fn parsing_keymaps_config_file() {
|
||||||
struct TomlConfig {
|
use helix_core::hashmap;
|
||||||
theme: Option<String>,
|
use helix_view::document::Mode;
|
||||||
#[serde(default)]
|
use helix_view::input::{KeyCode, KeyEvent, KeyModifiers};
|
||||||
lsp: LspConfig,
|
|
||||||
keys: Option<HashMap<String, HashMap<String, String>>>,
|
let sample_keymaps = r#"
|
||||||
}
|
[keys.insert]
|
||||||
|
y = "move_line_down"
|
||||||
|
S-C-a = "delete_selection"
|
||||||
|
|
||||||
|
[keys.normal]
|
||||||
|
A-F12 = "move_next_word_end"
|
||||||
|
"#;
|
||||||
|
|
||||||
impl<'de> Deserialize<'de> for Config {
|
assert_eq!(
|
||||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
toml::from_str::<Config>(sample_keymaps).unwrap(),
|
||||||
where
|
Config {
|
||||||
D: serde::Deserializer<'de>,
|
keys: Keymaps(hashmap! {
|
||||||
{
|
Mode::Insert => hashmap! {
|
||||||
let config = TomlConfig::deserialize(deserializer)?;
|
KeyEvent {
|
||||||
Ok(Self {
|
code: KeyCode::Char('y'),
|
||||||
theme: config.theme,
|
modifiers: KeyModifiers::NONE,
|
||||||
lsp: config.lsp,
|
} => Command::move_line_down,
|
||||||
keymaps: config
|
KeyEvent {
|
||||||
.keys
|
code: KeyCode::Char('a'),
|
||||||
.map(|r| parse_keymaps(&r))
|
modifiers: KeyModifiers::SHIFT | KeyModifiers::CONTROL,
|
||||||
.transpose()
|
} => Command::delete_selection,
|
||||||
.map_err(|e| D::Error::custom(format!("Error deserializing keymap: {}", e)))?
|
},
|
||||||
.unwrap_or_else(Keymaps::default),
|
Mode::Normal => hashmap! {
|
||||||
})
|
KeyEvent {
|
||||||
}
|
code: KeyCode::F(12),
|
||||||
|
modifiers: KeyModifiers::ALT,
|
||||||
|
} => Command::move_next_word_end,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,226 @@
|
|||||||
|
//! Input event handling, currently backed by crossterm.
|
||||||
|
use anyhow::{anyhow, Error};
|
||||||
|
use crossterm::event;
|
||||||
|
use serde::de::{self, Deserialize, Deserializer};
|
||||||
|
use std::fmt;
|
||||||
|
|
||||||
|
pub use crossterm::event::{KeyCode, KeyModifiers};
|
||||||
|
|
||||||
|
/// Represents a key event.
|
||||||
|
// We use a newtype here because we want to customize Deserialize and Display.
|
||||||
|
#[derive(Debug, PartialEq, Eq, PartialOrd, Clone, Copy, Hash)]
|
||||||
|
pub struct KeyEvent {
|
||||||
|
pub code: KeyCode,
|
||||||
|
pub modifiers: KeyModifiers,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for KeyEvent {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.write_fmt(format_args!(
|
||||||
|
"{}{}{}",
|
||||||
|
if self.modifiers.contains(KeyModifiers::SHIFT) {
|
||||||
|
"S-"
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
},
|
||||||
|
if self.modifiers.contains(KeyModifiers::ALT) {
|
||||||
|
"A-"
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
},
|
||||||
|
if self.modifiers.contains(KeyModifiers::CONTROL) {
|
||||||
|
"C-"
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
},
|
||||||
|
))?;
|
||||||
|
match self.code {
|
||||||
|
KeyCode::Backspace => f.write_str("backspace")?,
|
||||||
|
KeyCode::Enter => f.write_str("ret")?,
|
||||||
|
KeyCode::Left => f.write_str("left")?,
|
||||||
|
KeyCode::Right => f.write_str("right")?,
|
||||||
|
KeyCode::Up => f.write_str("up")?,
|
||||||
|
KeyCode::Down => f.write_str("down")?,
|
||||||
|
KeyCode::Home => f.write_str("home")?,
|
||||||
|
KeyCode::End => f.write_str("end")?,
|
||||||
|
KeyCode::PageUp => f.write_str("pageup")?,
|
||||||
|
KeyCode::PageDown => f.write_str("pagedown")?,
|
||||||
|
KeyCode::Tab => f.write_str("tab")?,
|
||||||
|
KeyCode::BackTab => f.write_str("backtab")?,
|
||||||
|
KeyCode::Delete => f.write_str("del")?,
|
||||||
|
KeyCode::Insert => f.write_str("ins")?,
|
||||||
|
KeyCode::Null => f.write_str("null")?,
|
||||||
|
KeyCode::Esc => f.write_str("esc")?,
|
||||||
|
KeyCode::Char('<') => f.write_str("lt")?,
|
||||||
|
KeyCode::Char('>') => f.write_str("gt")?,
|
||||||
|
KeyCode::Char('+') => f.write_str("plus")?,
|
||||||
|
KeyCode::Char('-') => f.write_str("minus")?,
|
||||||
|
KeyCode::Char(';') => f.write_str("semicolon")?,
|
||||||
|
KeyCode::Char('%') => f.write_str("percent")?,
|
||||||
|
KeyCode::F(i) => f.write_fmt(format_args!("F{}", i))?,
|
||||||
|
KeyCode::Char(c) => f.write_fmt(format_args!("{}", c))?,
|
||||||
|
};
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::str::FromStr for KeyEvent {
|
||||||
|
type Err = Error;
|
||||||
|
|
||||||
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||||
|
let mut tokens: Vec<_> = s.split('-').collect();
|
||||||
|
let code = match tokens.pop().ok_or_else(|| anyhow!("Missing key code"))? {
|
||||||
|
"backspace" => KeyCode::Backspace,
|
||||||
|
"space" => KeyCode::Char(' '),
|
||||||
|
"ret" => KeyCode::Enter,
|
||||||
|
"lt" => KeyCode::Char('<'),
|
||||||
|
"gt" => KeyCode::Char('>'),
|
||||||
|
"plus" => KeyCode::Char('+'),
|
||||||
|
"minus" => KeyCode::Char('-'),
|
||||||
|
"semicolon" => KeyCode::Char(';'),
|
||||||
|
"percent" => KeyCode::Char('%'),
|
||||||
|
"left" => KeyCode::Left,
|
||||||
|
"right" => KeyCode::Right,
|
||||||
|
"up" => KeyCode::Down,
|
||||||
|
"home" => KeyCode::Home,
|
||||||
|
"end" => KeyCode::End,
|
||||||
|
"pageup" => KeyCode::PageUp,
|
||||||
|
"pagedown" => KeyCode::PageDown,
|
||||||
|
"tab" => KeyCode::Tab,
|
||||||
|
"backtab" => KeyCode::BackTab,
|
||||||
|
"del" => KeyCode::Delete,
|
||||||
|
"ins" => KeyCode::Insert,
|
||||||
|
"null" => KeyCode::Null,
|
||||||
|
"esc" => KeyCode::Esc,
|
||||||
|
single if single.len() == 1 => KeyCode::Char(single.chars().next().unwrap()),
|
||||||
|
function if function.len() > 1 && function.starts_with('F') => {
|
||||||
|
let function: String = function.chars().skip(1).collect();
|
||||||
|
let function = str::parse::<u8>(&function)?;
|
||||||
|
(function > 0 && function < 13)
|
||||||
|
.then(|| KeyCode::F(function))
|
||||||
|
.ok_or_else(|| anyhow!("Invalid function key '{}'", function))?
|
||||||
|
}
|
||||||
|
invalid => return Err(anyhow!("Invalid key code '{}'", invalid)),
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut modifiers = KeyModifiers::empty();
|
||||||
|
for token in tokens {
|
||||||
|
let flag = match token {
|
||||||
|
"S" => KeyModifiers::SHIFT,
|
||||||
|
"A" => KeyModifiers::ALT,
|
||||||
|
"C" => KeyModifiers::CONTROL,
|
||||||
|
_ => return Err(anyhow!("Invalid key modifier '{}-'", token)),
|
||||||
|
};
|
||||||
|
|
||||||
|
if modifiers.contains(flag) {
|
||||||
|
return Err(anyhow!("Repeated key modifier '{}-'", token));
|
||||||
|
}
|
||||||
|
modifiers.insert(flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(KeyEvent { code, modifiers })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'de> Deserialize<'de> for KeyEvent {
|
||||||
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||||
|
where
|
||||||
|
D: Deserializer<'de>,
|
||||||
|
{
|
||||||
|
let s = String::deserialize(deserializer)?;
|
||||||
|
s.parse().map_err(de::Error::custom)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<event::KeyEvent> for KeyEvent {
|
||||||
|
fn from(event::KeyEvent { code, modifiers }: event::KeyEvent) -> KeyEvent {
|
||||||
|
KeyEvent { code, modifiers }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parsing_unmodified_keys() {
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("backspace").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::Backspace,
|
||||||
|
modifiers: KeyModifiers::NONE
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("left").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::Left,
|
||||||
|
modifiers: KeyModifiers::NONE
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>(",").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::Char(','),
|
||||||
|
modifiers: KeyModifiers::NONE
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("w").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::Char('w'),
|
||||||
|
modifiers: KeyModifiers::NONE
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("F12").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::F(12),
|
||||||
|
modifiers: KeyModifiers::NONE
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parsing_modified_keys() {
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("S-minus").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::Char('-'),
|
||||||
|
modifiers: KeyModifiers::SHIFT
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("C-A-S-F12").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::F(12),
|
||||||
|
modifiers: KeyModifiers::SHIFT | KeyModifiers::CONTROL | KeyModifiers::ALT
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
str::parse::<KeyEvent>("S-C-2").unwrap(),
|
||||||
|
KeyEvent {
|
||||||
|
code: KeyCode::Char('2'),
|
||||||
|
modifiers: KeyModifiers::SHIFT | KeyModifiers::CONTROL
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parsing_nonsensical_keys_fails() {
|
||||||
|
assert!(str::parse::<KeyEvent>("F13").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("F0").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("aaa").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("S-S-a").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("C-A-S-C-1").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("FU").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("123").is_err());
|
||||||
|
assert!(str::parse::<KeyEvent>("S--").is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue