Implement = (equalize/auto-indent) verb, fix dedent indexing, remove unimplemented screen-line motions, and clean up unreachable match arms
This commit is contained in:
24
src/main.rs
24
src/main.rs
@@ -38,7 +38,9 @@ use crate::prelude::*;
|
||||
use crate::procio::borrow_fd;
|
||||
use crate::readline::term::{LineWriter, RawModeGuard, raw_mode};
|
||||
use crate::readline::{Prompt, ReadlineEvent, ShedVi};
|
||||
use crate::signal::{GOT_SIGUSR1, GOT_SIGWINCH, JOB_DONE, QUIT_CODE, check_signals, sig_setup, signals_pending};
|
||||
use crate::signal::{
|
||||
GOT_SIGUSR1, GOT_SIGWINCH, JOB_DONE, QUIT_CODE, check_signals, sig_setup, signals_pending,
|
||||
};
|
||||
use crate::state::{
|
||||
AutoCmdKind, read_logic, read_shopts, source_env, source_login, source_rc, write_jobs,
|
||||
write_meta, write_shopts,
|
||||
@@ -285,16 +287,16 @@ fn shed_interactive(args: ShedArgs) -> ShResult<()> {
|
||||
readline.prompt_mut().refresh();
|
||||
}
|
||||
|
||||
if GOT_SIGUSR1.swap(false, Ordering::SeqCst) {
|
||||
log::info!("SIGUSR1 received: refreshing readline state");
|
||||
readline.mark_dirty();
|
||||
readline.prompt_mut().refresh();
|
||||
}
|
||||
if GOT_SIGUSR1.swap(false, Ordering::SeqCst) {
|
||||
log::info!("SIGUSR1 received: refreshing readline state");
|
||||
readline.mark_dirty();
|
||||
readline.prompt_mut().refresh();
|
||||
}
|
||||
|
||||
readline.print_line(false)?;
|
||||
|
||||
// Poll for
|
||||
// stdin input
|
||||
// stdin input
|
||||
let mut fds = [PollFd::new(
|
||||
unsafe { BorrowedFd::borrow_raw(*TTY_FILENO) },
|
||||
PollFlags::POLLIN,
|
||||
@@ -442,10 +444,10 @@ fn handle_readline_event(readline: &mut ShedVi, event: ShResult<ReadlineEvent>)
|
||||
}) {
|
||||
// CleanExit signals an intentional shell exit; any other error is printed.
|
||||
match e.kind() {
|
||||
ShErrKind::Interrupt => {
|
||||
// We got Ctrl+C during command execution
|
||||
// Just fall through here
|
||||
}
|
||||
ShErrKind::Interrupt => {
|
||||
// We got Ctrl+C during command execution
|
||||
// Just fall through here
|
||||
}
|
||||
ShErrKind::CleanExit(code) => {
|
||||
QUIT_CODE.store(*code, Ordering::SeqCst);
|
||||
return Ok(true);
|
||||
|
||||
Reference in New Issue
Block a user