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

Add Helix editing mode #642

Closed
wants to merge 2 commits into from
Closed

Add Helix editing mode #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21e2b4d
duplicate vi mode and rename it to hx mode
savente93 Oct 1, 2023
9713aa3
WIP
savente93 Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 239 additions & 0 deletions src/edit_mode/hx/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
use super::{motion::HxCharSearch, motion::Motion, parser::ReedlineOption};
use crate::{EditCommand, Hx, ReedlineEvent};
use std::iter::Peekable;

pub fn parse_command<'iter, I>(input: &mut Peekable<I>) -> Option<Command>
where
I: Iterator<Item = &'iter char>,
{
match input.peek() {
Some('d') => {
let _ = input.next();
Some(Command::Delete)
}
Some('p') => {
let _ = input.next();
Some(Command::PasteAfter)
}
Some('P') => {
let _ = input.next();
Some(Command::PasteBefore)
}
Some('i') => {
let _ = input.next();
Some(Command::EnterHxInsert)
}
Some('a') => {
let _ = input.next();
Some(Command::EnterHxAppend)
}
Some('u') => {
let _ = input.next();
Some(Command::Undo)
}
Some('U') => {
let _ = input.next();
Some(Command::Redo)
}
Some('c') => {
let _ = input.next();
Some(Command::Change)
}
Some('x') => {
let _ = input.next();
Some(Command::SelectLine)
}
Some('?') => {
let _ = input.next();
Some(Command::HistorySearch)
}
Some('I') => {
let _ = input.next();
Some(Command::PrependToStart)
}
Some('A') => {
let _ = input.next();
Some(Command::AppendToEnd)
}
Some('~') => {
let _ = input.next();
Some(Command::Switchcase)
}
Some('-') => {
let _ = input.next();
Some(Command::TrimSelection)
}
Some('.') => {
let _ = input.next();
Some(Command::RepeatLastInsertion)
}
_ => None,
}
}

#[derive(Debug, PartialEq, Eq)]
pub enum Command {
Incomplete,
Delete,
DeleteChar,
ReplaceChar(char),
PasteAfter,
PasteBefore,
EnterHxAppend,
EnterHxInsert,
Undo,
Redo,
SelectLine,
TrimSelection,
AppendToEnd,
PrependToStart,
Change,
HistorySearch,
Switchcase,
RepeatLastInsertion,
}

impl Command {
pub fn whole_line_char(&self) -> Option<char> {
match self {
Command::Delete => Some('d'),
Command::Change => Some('c'),
_ => None,
}
}

pub fn requires_motion(&self) -> bool {
matches!(self, Command::Delete | Command::Change)
}

pub fn to_reedline(&self, hx_state: &mut Hx) -> Vec<ReedlineOption> {
match self {
Self::EnterHxInsert => vec![ReedlineOption::Event(ReedlineEvent::Repaint)],
Self::EnterHxAppend => vec![ReedlineOption::Edit(EditCommand::MoveRight)],
Self::PasteAfter => vec![ReedlineOption::Edit(EditCommand::PasteCutBufferAfter)],
Self::PasteBefore => vec![ReedlineOption::Edit(EditCommand::PasteCutBufferBefore)],
Self::Undo => vec![ReedlineOption::Edit(EditCommand::Undo)],
Self::AppendToEnd => vec![ReedlineOption::Edit(EditCommand::MoveToLineEnd)],
Self::PrependToStart => vec![ReedlineOption::Edit(EditCommand::MoveToLineStart)],
Self::DeleteChar => vec![ReedlineOption::Edit(EditCommand::CutChar)],
Self::ReplaceChar(c) => {
vec![ReedlineOption::Edit(EditCommand::ReplaceChar(*c))]
}
Self::HistorySearch => vec![ReedlineOption::Event(ReedlineEvent::SearchHistory)],
Self::Switchcase => vec![ReedlineOption::Edit(EditCommand::SwitchcaseChar)],
// Mark a command as incomplete whenever a motion is required to finish the command
Self::Delete | Self::Change | Self::Incomplete => vec![ReedlineOption::Incomplete],
Self::RepeatLastInsertion => match &hx_state.previous {
Some(event) => vec![ReedlineOption::Event(event.clone())],
None => vec![],
},
Self::Redo => todo!(),
Self::SelectLine => todo!(),
Self::TrimSelection => todo!(),
}
}

pub fn to_reedline_with_motion(
&self,
motion: &Motion,
hx_state: &mut Hx,
) -> Option<Vec<ReedlineOption>> {
match self {
Self::Delete => match motion {
Motion::End => Some(vec![ReedlineOption::Edit(EditCommand::CutToLineEnd)]),
Motion::Line => Some(vec![ReedlineOption::Edit(EditCommand::CutCurrentLine)]),
Motion::NextWord => {
Some(vec![ReedlineOption::Edit(EditCommand::CutWordRightToNext)])
}
Motion::NextBigWord => Some(vec![ReedlineOption::Edit(
EditCommand::CutBigWordRightToNext,
)]),
Motion::NextWordEnd => Some(vec![ReedlineOption::Edit(EditCommand::CutWordRight)]),
Motion::NextBigWordEnd => {
Some(vec![ReedlineOption::Edit(EditCommand::CutBigWordRight)])
}
Motion::PreviousWord => Some(vec![ReedlineOption::Edit(EditCommand::CutWordLeft)]),
Motion::PreviousBigWord => {
Some(vec![ReedlineOption::Edit(EditCommand::CutBigWordLeft)])
}
Motion::RightUntil(c) => {
hx_state.last_char_search = Some(HxCharSearch::ToRight(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutRightUntil(*c))])
}
Motion::RightBefore(c) => {
hx_state.last_char_search = Some(HxCharSearch::TillRight(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutRightBefore(*c))])
}
Motion::LeftUntil(c) => {
hx_state.last_char_search = Some(HxCharSearch::ToLeft(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutLeftUntil(*c))])
}
Motion::LeftBefore(c) => {
hx_state.last_char_search = Some(HxCharSearch::TillLeft(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutLeftBefore(*c))])
}
Motion::Start => Some(vec![ReedlineOption::Edit(EditCommand::CutFromLineStart)]),
Motion::Left => Some(vec![ReedlineOption::Edit(EditCommand::Backspace)]),
Motion::Right => Some(vec![ReedlineOption::Edit(EditCommand::Delete)]),
Motion::Up => None,
Motion::Down => None,
},
Self::Change => {
let op = match motion {
Motion::End => Some(vec![ReedlineOption::Edit(EditCommand::ClearToLineEnd)]),
Motion::Line => Some(vec![
ReedlineOption::Edit(EditCommand::MoveToStart),
ReedlineOption::Edit(EditCommand::ClearToLineEnd),
]),
Motion::NextWord => {
Some(vec![ReedlineOption::Edit(EditCommand::CutWordRightToNext)])
}
Motion::NextBigWord => Some(vec![ReedlineOption::Edit(
EditCommand::CutBigWordRightToNext,
)]),
Motion::NextWordEnd => {
Some(vec![ReedlineOption::Edit(EditCommand::CutWordRight)])
}
Motion::NextBigWordEnd => {
Some(vec![ReedlineOption::Edit(EditCommand::CutBigWordRight)])
}
Motion::PreviousWord => {
Some(vec![ReedlineOption::Edit(EditCommand::CutWordLeft)])
}
Motion::PreviousBigWord => {
Some(vec![ReedlineOption::Edit(EditCommand::CutBigWordLeft)])
}
Motion::RightUntil(c) => {
hx_state.last_char_search = Some(HxCharSearch::ToRight(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutRightUntil(*c))])
}
Motion::RightBefore(c) => {
hx_state.last_char_search = Some(HxCharSearch::TillRight(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutRightBefore(*c))])
}
Motion::LeftUntil(c) => {
hx_state.last_char_search = Some(HxCharSearch::ToLeft(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutLeftUntil(*c))])
}
Motion::LeftBefore(c) => {
hx_state.last_char_search = Some(HxCharSearch::TillLeft(*c));
Some(vec![ReedlineOption::Edit(EditCommand::CutLeftBefore(*c))])
}
Motion::Start => {
Some(vec![ReedlineOption::Edit(EditCommand::CutFromLineStart)])
}
Motion::Left => Some(vec![ReedlineOption::Edit(EditCommand::Backspace)]),
Motion::Right => Some(vec![ReedlineOption::Edit(EditCommand::Delete)]),
Motion::Up => None,
Motion::Down => None,
};
// Semihack: Append `Repaint` to ensure the mode change gets displayed
op.map(|mut vec| {
vec.push(ReedlineOption::Event(ReedlineEvent::Repaint));
vec
})
}
_ => None,
}
}
}
26 changes: 26 additions & 0 deletions src/edit_mode/hx/hx_keybindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use crate::edit_mode::{
keybindings::{
add_common_control_bindings, add_common_edit_bindings, add_common_navigation_bindings,
},
Keybindings,
};

/// Default Hx normal keybindings
pub fn default_hx_normal_keybindings() -> Keybindings {
let mut kb = Keybindings::new();

add_common_control_bindings(&mut kb);
add_common_navigation_bindings(&mut kb);
kb
}

/// Default Hx insert keybindings
pub fn default_hx_insert_keybindings() -> Keybindings {
let mut kb = Keybindings::new();

add_common_control_bindings(&mut kb);
add_common_navigation_bindings(&mut kb);
add_common_edit_bindings(&mut kb);

kb
}
Loading
Loading