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

Working on insert in completion #174

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Working on insert in completion #174

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18fc70b
Working on insert in completion
nithinmuthukumar May 30, 2023
fc785b4
temporarily disabling menu
nithinmuthukumar Jun 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
94 changes: 52 additions & 42 deletions shrs_line/src/line.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,23 +240,21 @@ impl Line {
}
}

let should_break = self.handle_standard_keys(line_ctx, event.clone())?;
if should_break {
break;
}

// handle menu events
if self.menu.is_active() {
self.handle_menu_keys(line_ctx, event.clone())?;
} else {
// TODO bit hacky bubbling up control flow from funtion
match line_ctx.mode {
LineMode::Insert => {
let should_break = self.handle_insert_keys(line_ctx, event)?;
if should_break {
break;
}
self.handle_insert_keys(line_ctx, event)?;
},
LineMode::Normal => {
let should_break = self.handle_normal_keys(line_ctx, event)?;
if should_break {
break;
}
self.handle_normal_keys(line_ctx, event)?;
},
}
}
Expand Down Expand Up @@ -339,7 +337,17 @@ impl Line {
}) => {
self.menu.next();
},
_ => {},
_ => {
self.menu.disactivate();
match ctx.mode {
LineMode::Insert => {
self.handle_insert_keys(ctx, event)?;
},
LineMode::Normal => {
self.handle_normal_keys(ctx, event)?;
},
};
},
};
Ok(())
}
Expand Down Expand Up @@ -422,8 +430,8 @@ impl Line {

res
}

fn handle_insert_keys(&mut self, ctx: &mut LineCtx, event: Event) -> anyhow::Result<bool> {
//Keys that are universal regardless of mode, ex. Enter, Ctrl-c
fn handle_standard_keys(&mut self, ctx: &mut LineCtx, event: Event) -> anyhow::Result<bool> {
match event {
Event::Key(KeyEvent {
code: KeyCode::Enter,
Expand All @@ -435,6 +443,9 @@ impl Line {
modifiers: KeyModifiers::CONTROL,
..
}) => {
if self.menu.is_active() {
return Ok(false);
}
self.buffer_history.clear();
self.painter.newline()?;

Expand All @@ -448,6 +459,32 @@ impl Line {

return Ok(true);
},
Event::Key(KeyEvent {
code: KeyCode::Char('d'),
modifiers: KeyModifiers::CONTROL,
..
}) => {
// if current input is empty exit the shell, otherwise treat it as enter
if ctx.cb.len() == 0 {
// TODO maybe unify exiting the shell
disable_raw_mode(); // TODO this is temp fix, should be more graceful way of
// handling cleanup code
std::process::exit(0);
} else {
self.buffer_history.clear();
self.painter.newline()?;
return Ok(true);
}
},

_ => (),
};

Ok(false)
}

fn handle_insert_keys(&mut self, ctx: &mut LineCtx, event: Event) -> anyhow::Result<()> {
match event {
Event::Key(KeyEvent {
code: KeyCode::Tab,
modifiers: KeyModifiers::NONE,
Expand Down Expand Up @@ -527,23 +564,6 @@ impl Line {
}
},

Event::Key(KeyEvent {
code: KeyCode::Char('d'),
modifiers: KeyModifiers::CONTROL,
..
}) => {
// if current input is empty exit the shell, otherwise treat it as enter
if ctx.cb.len() == 0 {
// TODO maybe unify exiting the shell
disable_raw_mode(); // TODO this is temp fix, should be more graceful way of
// handling cleanup code
std::process::exit(0);
} else {
self.buffer_history.clear();
self.painter.newline()?;
return Ok(true);
}
},
Event::Key(KeyEvent {
code: KeyCode::Char(c),
..
Expand All @@ -552,22 +572,12 @@ impl Line {
},
_ => {},
};
Ok(false)
Ok(())
}

fn handle_normal_keys(&mut self, ctx: &mut LineCtx, event: Event) -> anyhow::Result<bool> {
fn handle_normal_keys(&mut self, ctx: &mut LineCtx, event: Event) -> anyhow::Result<()> {
// TODO write better system toString support key combinations
match event {
Event::Key(KeyEvent {
code: KeyCode::Enter,
modifiers: KeyModifiers::NONE,
..
}) => {
self.buffer_history.clear();

self.painter.newline()?;
return Ok(true);
},
Event::Key(KeyEvent {
code: KeyCode::Esc, ..
}) => {
Expand Down Expand Up @@ -609,7 +619,7 @@ impl Line {
},
_ => {},
}
Ok(false)
Ok(())
}

// recalculate the current completions
Expand Down