pagedmov/shed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ran the codebase through rustfmt

Browse Source
This commit is contained in:
pagedmov
2026-02-23 23:32:46 -05:00
parent fa49e2ef70
commit cf46303659
27 changed files with 254 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtin/alias.rs
View File

@@ -3,7 +3,7 @@ use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::{self, read_logic, write_logic},
};

4
src/builtin/echo.rs
View File

@@ -3,12 +3,12 @@ use std::sync::LazyLock;
use crate::{
builtin::setup_builtin,
expand::expand_prompt,
getopt::{Opt, OptSpec, get_opts_from_tokens},
getopt::{get_opts_from_tokens, Opt, OptSpec},
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult, ShResultExt},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state,
};

13
src/builtin/eval.rs
View File

@@ -4,7 +4,7 @@ use crate::{
builtin::setup_builtin,
jobs::JobBldr,
libsh::error::ShResult,
parse::{NdRule, Node, execute::exec_input},
parse::{execute::exec_input, NdRule, Node},
procio::IoStack,
state,
};
@@ -25,10 +25,11 @@ pub fn eval(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<(
return Ok(());
}
let joined_argv = expanded_argv.into_iter()
.map(|(s, _)| s)
.collect::<Vec<_>>()
.join(" ");
let joined_argv = expanded_argv
.into_iter()
.map(|(s, _)| s)
.collect::<Vec<_>>()
.join(" ");
exec_input(joined_argv, None, false)
exec_input(joined_argv, None, false)
}

10
src/builtin/exec.rs
View File

@@ -4,7 +4,7 @@ use crate::{
builtin::setup_builtin,
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node, execute::ExecArgs},
parse::{execute::ExecArgs, NdRule, Node},
procio::IoStack,
state,
};
@@ -40,11 +40,7 @@ pub fn exec_builtin(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> Sh
// execvpe only returns on error
let cmd_str = cmd.to_str().unwrap().to_string();
match e {
Errno::ENOENT => {
Err(ShErr::full(ShErrKind::CmdNotFound(cmd_str), "", span))
}
_ => {
Err(ShErr::full(ShErrKind::Errno(e), format!("{e}"), span))
}
Errno::ENOENT => Err(ShErr::full(ShErrKind::CmdNotFound(cmd_str), "", span)),
_ => Err(ShErr::full(ShErrKind::Errno(e), format!("{e}"), span)),
}
}

29
src/builtin/export.rs
View File

@@ -3,8 +3,8 @@ use crate::{
libsh::error::ShResult,
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
state::{self, VarFlags, read_vars, write_vars},
procio::{borrow_fd, IoStack},
state::{self, read_vars, write_vars, VarFlags},
};
use super::setup_builtin;
@@ -35,10 +35,10 @@ pub fn export(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult
for (arg, _) in argv {
if let Some((var, val)) = arg.split_once('=') {
write_vars(|v| v.set_var(var, val, VarFlags::EXPORT)); // Export an assignment like
// 'foo=bar'
// 'foo=bar'
} else {
write_vars(|v| v.export_var(&arg)); // Export an existing variable, if
// any
// any
}
}
}
@@ -59,16 +59,17 @@ pub fn local(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<
if argv.is_empty() {
// Display the local variables
let vars_output = read_vars(|v| {
let mut vars = v.flatten_vars()
.into_iter()
.map(|(k, v)| format!("{}={}", k, v))
.collect::<Vec<String>>();
vars.sort();
let mut vars_joined = vars.join("\n");
vars_joined.push('\n');
vars_joined
});
let vars_output = read_vars(|v| {
let mut vars = v
.flatten_vars()
.into_iter()
.map(|(k, v)| format!("{}={}", k, v))
.collect::<Vec<String>>();
vars.sort();
let mut vars_joined = vars.join("\n");
vars_joined.push('\n');
vars_joined
});
let stdout = borrow_fd(STDOUT_FILENO);
write(stdout, vars_output.as_bytes())?; // Write it

2
src/builtin/flowctl.rs
View File

@@ -1,6 +1,6 @@
use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node, execute::prepare_argv},
parse::{execute::prepare_argv, NdRule, Node},
prelude::*,
};

48
src/builtin/jobctl.rs
View File

@@ -1,9 +1,9 @@
use crate::{
jobs::{JobBldr, JobCmdFlags, JobID},
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node, lex::Span},
parse::{lex::Span, NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::{self, read_jobs, write_jobs},
};
@@ -181,7 +181,7 @@ pub fn jobs(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<(
}
pub fn disown(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult<()> {
let blame = node.get_span().clone();
let blame = node.get_span().clone();
let NdRule::Command {
assignments: _,
argv,
@@ -196,29 +196,33 @@ pub fn disown(node: Node, io_stack: &mut IoStack, job: &mut JobBldr) -> ShResult
let curr_job_id = if let Some(id) = read_jobs(|j| j.curr_job()) {
id
} else {
return Err(ShErr::full(ShErrKind::ExecFail, "disown: No jobs to disown", blame));
return Err(ShErr::full(
ShErrKind::ExecFail,
"disown: No jobs to disown",
blame,
));
};
let mut tabid = curr_job_id;
let mut nohup = false;
let mut disown_all = false;
let mut nohup = false;
let mut disown_all = false;
while let Some((arg, span)) = argv.next() {
match arg.as_str() {
"-h" => nohup = true,
"-a" => disown_all = true,
_ => {
tabid = parse_job_id(&arg, span.clone())?;
}
}
}
while let Some((arg, span)) = argv.next() {
match arg.as_str() {
"-h" => nohup = true,
"-a" => disown_all = true,
_ => {
tabid = parse_job_id(&arg, span.clone())?;
}
}
}
if disown_all {
write_jobs(|j| j.disown_all(nohup))?;
} else {
write_jobs(|j| j.disown(JobID::TableID(tabid), nohup))?;
}
if disown_all {
write_jobs(|j| j.disown_all(nohup))?;
} else {
write_jobs(|j| j.disown(JobID::TableID(tabid), nohup))?;
}
state::set_status(0);
Ok(())
state::set_status(0);
Ok(())
}

2
src/builtin/pwd.rs
View File

@@ -3,7 +3,7 @@ use crate::{
libsh::error::ShResult,
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state,
};

6
src/builtin/read.rs
View File

@@ -7,13 +7,13 @@ use nix::{
use crate::{
builtin::setup_builtin,
getopt::{Opt, OptSpec, get_opts_from_tokens},
getopt::{get_opts_from_tokens, Opt, OptSpec},
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult, ShResultExt},
parse::{NdRule, Node},
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
prompt::readline::term::RawModeGuard,
state::{self, VarFlags, read_vars, write_vars},
state::{self, read_vars, write_vars, VarFlags},
};
pub const READ_OPTS: [OptSpec; 7] = [

2
src/builtin/shopt.rs
View File

@@ -3,7 +3,7 @@ use crate::{
libsh::error::{ShResult, ShResultExt},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::write_shopts,
};

2
src/builtin/test.rs
View File

@@ -8,7 +8,7 @@ use regex::Regex;
use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{ConjunctOp, NdRule, Node, TEST_UNARY_OPS, TestCase},
parse::{ConjunctOp, NdRule, Node, TestCase, TEST_UNARY_OPS},
prelude::*,
};

2
src/builtin/trap.rs
View File

@@ -11,7 +11,7 @@ use crate::{
jobs::JobBldr,
libsh::error::{ShErr, ShErrKind, ShResult},
parse::{NdRule, Node},
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
state::{self, read_logic, write_logic},
};

4
src/builtin/zoltraak.rs
View File

@@ -1,12 +1,12 @@
use std::{os::unix::fs::OpenOptionsExt, sync::LazyLock};
use crate::{
getopt::{Opt, OptSet, OptSpec, get_opts_from_tokens},
getopt::{get_opts_from_tokens, Opt, OptSet, OptSpec},
jobs::JobBldr,
libsh::error::{Note, ShErr, ShErrKind, ShResult, ShResultExt},
parse::{NdRule, Node},
prelude::*,
procio::{IoStack, borrow_fd},
procio::{borrow_fd, IoStack},
};
use super::setup_builtin;

92
src/jobs.rs
View File

@@ -4,7 +4,7 @@ use crate::{
term::{Style, Styled},
},
prelude::*,
procio::{IoMode, borrow_fd},
procio::{borrow_fd, IoMode},
signal::{disable_reaping, enable_reaping},
state::{self, read_jobs, set_status, write_jobs},
};
@@ -384,40 +384,40 @@ impl JobTab {
Ok(())
}
pub fn hang_up(&mut self) {
for job in self.jobs_mut().iter_mut().flatten() {
if job.send_hup {
job.killpg(Signal::SIGHUP).ok();
}
}
}
pub fn hang_up(&mut self) {
for job in self.jobs_mut().iter_mut().flatten() {
if job.send_hup {
job.killpg(Signal::SIGHUP).ok();
}
}
}
pub fn disown(&mut self, id: JobID, nohup: bool) -> ShResult<()> {
if let Some(job) = self.query_mut(id.clone()) {
if nohup {
job.no_hup();
} else {
self.remove_job(id);
}
}
Ok(())
}
pub fn disown(&mut self, id: JobID, nohup: bool) -> ShResult<()> {
if let Some(job) = self.query_mut(id.clone()) {
if nohup {
job.no_hup();
} else {
self.remove_job(id);
}
}
Ok(())
}
pub fn disown_all(&mut self, nohup: bool) -> ShResult<()> {
let mut ids_to_remove = vec![];
for job in self.jobs_mut().iter_mut().flatten() {
if nohup {
job.no_hup();
} else {
ids_to_remove.push(JobID::TableID(job.tabid().unwrap()));
}
}
pub fn disown_all(&mut self, nohup: bool) -> ShResult<()> {
let mut ids_to_remove = vec![];
for job in self.jobs_mut().iter_mut().flatten() {
if nohup {
job.no_hup();
} else {
ids_to_remove.push(JobID::TableID(job.tabid().unwrap()));
}
}
for id in ids_to_remove {
self.remove_job(id);
}
Ok(())
}
for id in ids_to_remove {
self.remove_job(id);
}
Ok(())
}
}
#[derive(Debug)]
@@ -425,7 +425,7 @@ pub struct JobBldr {
table_id: Option<usize>,
pgid: Option<Pid>,
children: Vec<ChildProc>,
send_hup: bool,
send_hup: bool,
}
impl Default for JobBldr {
@@ -440,7 +440,7 @@ impl JobBldr {
table_id: None,
pgid: None,
children: vec![],
send_hup: true,
send_hup: true,
}
}
pub fn with_id(self, id: usize) -> Self {
@@ -448,7 +448,7 @@ impl JobBldr {
table_id: Some(id),
pgid: self.pgid,
children: self.children,
send_hup: self.send_hup,
send_hup: self.send_hup,
}
}
pub fn with_pgid(self, pgid: Pid) -> Self {
@@ -456,7 +456,7 @@ impl JobBldr {
table_id: self.table_id,
pgid: Some(pgid),
children: self.children,
send_hup: self.send_hup,
send_hup: self.send_hup,
}
}
pub fn set_pgid(&mut self, pgid: Pid) {
@@ -465,16 +465,16 @@ impl JobBldr {
pub fn pgid(&self) -> Option<Pid> {
self.pgid
}
pub fn no_hup(mut self) -> Self {
self.send_hup = false;
self
}
pub fn no_hup(mut self) -> Self {
self.send_hup = false;
self
}
pub fn with_children(self, children: Vec<ChildProc>) -> Self {
Self {
table_id: self.table_id,
pgid: self.pgid,
children,
send_hup: self.send_hup,
send_hup: self.send_hup,
}
}
pub fn push_child(&mut self, child: ChildProc) {
@@ -485,7 +485,7 @@ impl JobBldr {
table_id: self.table_id,
pgid: self.pgid.unwrap_or(Pid::from_raw(0)),
children: self.children,
send_hup: self.send_hup,
send_hup: self.send_hup,
}
}
}
@@ -514,16 +514,16 @@ pub struct Job {
table_id: Option<usize>,
pgid: Pid,
children: Vec<ChildProc>,
send_hup: bool,
send_hup: bool,
}
impl Job {
pub fn set_tabid(&mut self, id: usize) {
self.table_id = Some(id)
}
pub fn no_hup(&mut self) {
self.send_hup = false;
}
pub fn no_hup(&mut self) {
self.send_hup = false;
}
pub fn running(&self) -> bool {
!self.children.iter().all(|chld| chld.exited())
}

3
src/libsh/sys.rs
View File

@@ -34,8 +34,7 @@ use crate::prelude::*;
pub(crate) static mut SAVED_TERMIOS: Option<Option<Termios>> = None;
pub static TTY_FILENO: LazyLock<RawFd> = LazyLock::new(|| {
open("/dev/tty", OFlag::O_RDWR, Mode::empty())
.expect("Failed to open /dev/tty")
open("/dev/tty", OFlag::O_RDWR, Mode::empty()).expect("Failed to open /dev/tty")
});
#[derive(Debug)]

20
src/libsh/term.rs
View File

@@ -15,8 +15,8 @@ impl<T: Display> Styled for T {}
pub enum Style {
// Undoes all styles
Reset,
ResetFg,
ResetBg,
ResetFg,
ResetBg,
// Foreground Colors
Black,
Red,
@@ -68,8 +68,8 @@ impl Display for Style {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Style::Reset => write!(f, "\x1b[0m"),
Style::ResetFg => write!(f, "\x1b[39m"),
Style::ResetBg => write!(f, "\x1b[49m"),
Style::ResetFg => write!(f, "\x1b[39m"),
Style::ResetBg => write!(f, "\x1b[49m"),
// Foreground colors
Style::Black => write!(f, "\x1b[30m"),
@@ -131,13 +131,13 @@ impl StyleSet {
Self { styles: vec![] }
}
pub fn styles(&self) -> &[Style] {
&self.styles
}
pub fn styles(&self) -> &[Style] {
&self.styles
}
pub fn styles_mut(&mut self) -> &mut Vec<Style> {
&mut self.styles
}
pub fn styles_mut(&mut self) -> &mut Vec<Style> {
&mut self.styles
}
pub fn add_style(mut self, style: Style) -> Self {
if !self.styles.contains(&style) {

10
src/prelude.rs
View File

@@ -19,17 +19,17 @@ pub use std::os::unix::io::{AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd,
pub use bitflags::bitflags;
pub use nix::{
errno::Errno,
fcntl::{OFlag, open},
fcntl::{open, OFlag},
libc::{self, STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO},
sys::{
signal::{self, SigHandler, SigSet, SigmaskHow, Signal, kill, killpg, pthread_sigmask, signal},
signal::{self, kill, killpg, pthread_sigmask, signal, SigHandler, SigSet, SigmaskHow, Signal},
stat::Mode,
termios::{self},
wait::{WaitPidFlag as WtFlag, WaitStatus as WtStat, waitpid},
wait::{waitpid, WaitPidFlag as WtFlag, WaitStatus as WtStat},
},
unistd::{
ForkResult, Pid, close, dup, dup2, execvpe, fork, getpgid, getpgrp, isatty, pipe, read,
setpgid, tcgetpgrp, tcsetpgrp, write,
close, dup, dup2, execvpe, fork, getpgid, getpgrp, isatty, pipe, read, setpgid, tcgetpgrp,
tcsetpgrp, write, ForkResult, Pid,
},
};

30
src/procio.rs
View File

@@ -9,7 +9,7 @@ use crate::{
error::{ShErr, ShErrKind, ShResult},
utils::RedirVecUtils,
},
parse::{Redir, RedirType, get_redir_file},
parse::{get_redir_file, Redir, RedirType},
prelude::*,
};
@@ -39,9 +39,9 @@ pub enum IoMode {
buf: String,
pipe: Arc<OwnedFd>,
},
Close {
tgt_fd: RawFd,
}
Close {
tgt_fd: RawFd,
},
}
impl IoMode {
@@ -79,7 +79,7 @@ impl IoMode {
let path_raw = path.as_os_str().to_str().unwrap_or_default().to_string();
let expanded_path = Expander::from_raw(&path_raw)?.expand()?.join(" "); // should just be one string, will have to find some way to handle a return of
// multiple
// multiple
let expanded_pathbuf = PathBuf::from(expanded_path);
@@ -157,17 +157,17 @@ impl<R: Read> IoBuf<R> {
pub struct RedirGuard(IoFrame);
impl RedirGuard {
pub fn persist(mut self) {
if let Some(saved) = self.0.saved_io.take() {
close(saved.0).ok();
close(saved.1).ok();
close(saved.2).ok();
}
pub fn persist(mut self) {
if let Some(saved) = self.0.saved_io.take() {
close(saved.0).ok();
close(saved.1).ok();
close(saved.2).ok();
}
// the guard is dropped here
// but since we took the saved fds
// the drop does not restore them
}
// the guard is dropped here
// but since we took the saved fds
// the drop does not restore them
}
}
impl Drop for RedirGuard {

27
src/prompt/readline/history.rs
View File

@@ -9,8 +9,11 @@ use std::{
time::{Duration, SystemTime, UNIX_EPOCH},
};
use crate::{libsh::error::{ShErr, ShErrKind, ShResult}, prompt::readline::linebuf::LineBuf};
use crate::prelude::*;
use crate::{
libsh::error::{ShErr, ShErrKind, ShResult},
prompt::readline::linebuf::LineBuf,
};
use super::vicmd::Direction; // surprisingly useful
@@ -271,23 +274,23 @@ impl History {
}
pub fn update_pending_cmd(&mut self, buf: (&str, usize)) {
let cursor_pos = if let Some(pending) = &self.pending {
pending.cursor.get()
} else {
buf.1
};
let cursor_pos = if let Some(pending) = &self.pending {
pending.cursor.get()
} else {
buf.1
};
let cmd = buf.0.to_string();
let constraint = SearchConstraint {
kind: SearchKind::Prefix,
term: cmd.clone(),
};
if let Some(pending) = &mut self.pending {
pending.set_buffer(cmd);
pending.cursor.set(cursor_pos);
} else {
self.pending = Some(LineBuf::new().with_initial(&cmd, cursor_pos));
}
if let Some(pending) = &mut self.pending {
pending.set_buffer(cmd);
pending.cursor.set(cursor_pos);
} else {
self.pending = Some(LineBuf::new().with_initial(&cmd, cursor_pos));
}
self.constrain_entries(constraint);
}

33
src/prompt/readline/term.rs
View File

@@ -18,7 +18,13 @@ use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
use vte::{Parser, Perform};
use crate::{
libsh::{error::{ShErr, ShErrKind, ShResult}, sys::TTY_FILENO}, prompt::readline::keys::{KeyCode, ModKeys}, shopt::FernBellStyle, state::read_shopts
libsh::{
error::{ShErr, ShErrKind, ShResult},
sys::TTY_FILENO,
},
prompt::readline::keys::{KeyCode, ModKeys},
shopt::FernBellStyle,
state::read_shopts,
};
use crate::{
prelude::*,
@@ -107,7 +113,8 @@ fn write_all(fd: RawFd, buf: &str) -> nix::Result<()> {
Ok(())
}
/// Check if a string ends with a newline, ignoring any trailing ANSI escape sequences.
/// Check if a string ends with a newline, ignoring any trailing ANSI escape
/// sequences.
fn ends_with_newline(s: &str) -> bool {
let bytes = s.as_bytes();
let mut i = bytes.len();
@@ -208,7 +215,7 @@ pub trait LineWriter {
fn clear_rows(&mut self, layout: &Layout) -> ShResult<()>;
fn redraw(&mut self, prompt: &str, line: &str, new_layout: &Layout) -> ShResult<()>;
fn flush_write(&mut self, buf: &str) -> ShResult<()>;
fn send_bell(&mut self) -> ShResult<()>;
fn send_bell(&mut self) -> ShResult<()>;
}
#[derive(Clone, Copy, Debug)]
@@ -757,12 +764,7 @@ impl Layout {
end: Pos::default(),
}
}
pub fn from_parts(
term_width: u16,
prompt: &str,
to_cursor: &str,
to_end: &str,
) -> Self {
pub fn from_parts(term_width: u16, prompt: &str, to_cursor: &str, to_end: &str) -> Self {
let prompt_end = Self::calc_pos(term_width, prompt, Pos { col: 0, row: 0 });
let cursor = Self::calc_pos(term_width, to_cursor, prompt_end);
let end = Self::calc_pos(term_width, to_end, prompt_end);
@@ -998,11 +1000,10 @@ impl LineWriter for TermWriter {
Ok(())
}
fn send_bell(&mut self) -> ShResult<()> {
if read_shopts(|o| o.core.bell_enabled) {
self.flush_write("\x07")?;
}
Ok(())
}
fn send_bell(&mut self) -> ShResult<()> {
if read_shopts(|o| o.core.bell_enabled) {
self.flush_write("\x07")?;
}
Ok(())
}
}

47
src/shopt.rs
View File

@@ -212,12 +212,10 @@ impl ShOptCore {
}
"bell_enabled" => {
let Ok(val) = val.parse::<bool>() else {
return Err(
ShErr::simple(
ShErrKind::SyntaxErr,
"shopt: expected 'true' or 'false' for bell_enabled value",
),
);
return Err(ShErr::simple(
ShErrKind::SyntaxErr,
"shopt: expected 'true' or 'false' for bell_enabled value",
));
};
self.bell_enabled = val;
}
@@ -371,7 +369,7 @@ pub struct ShOptPrompt {
pub edit_mode: FernEditMode,
pub comp_limit: usize,
pub highlight: bool,
pub auto_indent: bool
pub auto_indent: bool,
}
impl ShOptPrompt {
@@ -413,15 +411,15 @@ impl ShOptPrompt {
};
self.highlight = val;
}
"auto_indent" => {
let Ok(val) = val.parse::<bool>() else {
return Err(ShErr::simple(
ShErrKind::SyntaxErr,
"shopt: expected 'true' or 'false' for auto_indent value",
));
};
self.auto_indent = val;
}
"auto_indent" => {
let Ok(val) = val.parse::<bool>() else {
return Err(ShErr::simple(
ShErrKind::SyntaxErr,
"shopt: expected 'true' or 'false' for auto_indent value",
));
};
self.auto_indent = val;
}
"custom" => {
todo!()
}
@@ -480,11 +478,12 @@ impl ShOptPrompt {
output.push_str(&format!("{}", self.highlight));
Ok(Some(output))
}
"auto_indent" => {
let mut output = String::from("Whether to automatically indent new lines in multiline commands\n");
output.push_str(&format!("{}", self.auto_indent));
Ok(Some(output))
}
"auto_indent" => {
let mut output =
String::from("Whether to automatically indent new lines in multiline commands\n");
output.push_str(&format!("{}", self.auto_indent));
Ok(Some(output))
}
_ => Err(
ShErr::simple(
ShErrKind::SyntaxErr,
@@ -499,7 +498,7 @@ impl ShOptPrompt {
"edit_mode",
"comp_limit",
"highlight",
"auto_indent",
"auto_indent",
]),
),
),
@@ -515,7 +514,7 @@ impl Display for ShOptPrompt {
output.push(format!("edit_mode = {}", self.edit_mode));
output.push(format!("comp_limit = {}", self.comp_limit));
output.push(format!("highlight = {}", self.highlight));
output.push(format!("auto_indent = {}", self.auto_indent));
output.push(format!("auto_indent = {}", self.auto_indent));
let final_output = output.join("\n");
@@ -530,7 +529,7 @@ impl Default for ShOptPrompt {
edit_mode: FernEditMode::Vi,
comp_limit: 100,
highlight: true,
auto_indent: true
auto_indent: true,
}
}
}

22
src/tests/complete.rs
View File

@@ -6,7 +6,7 @@ use tempfile::TempDir;
use crate::prompt::readline::complete::Completer;
use crate::prompt::readline::markers;
use crate::state::{VarFlags, write_logic, write_vars};
use crate::state::{write_logic, write_vars, VarFlags};
use super::*;
@@ -192,12 +192,10 @@ fn complete_filename_with_slash() {
// Should complete files in subdir/
if result.is_some() {
assert!(
completer
.candidates
.iter()
.any(|c| c.contains("nested.txt"))
);
assert!(completer
.candidates
.iter()
.any(|c| c.contains("nested.txt")));
}
}
@@ -704,12 +702,10 @@ fn complete_special_characters_in_filename() {
if result.is_some() {
// Should handle special chars in filenames
assert!(
completer
.candidates
.iter()
.any(|c| c.contains("file-with-dash") || c.contains("file_with_underscore"))
);
assert!(completer
.candidates
.iter()
.any(|c| c.contains("file-with-dash") || c.contains("file_with_underscore")));
}
}

2
src/tests/expand.rs
View File

@@ -1,6 +1,6 @@
use std::collections::HashSet;
use crate::expand::{DUB_QUOTE, VAR_SUB, perform_param_expansion};
use crate::expand::{perform_param_expansion, DUB_QUOTE, VAR_SUB};
use crate::state::VarFlags;
use super::*;

3
src/tests/mod.rs
View File

@@ -4,9 +4,8 @@ use super::*;
use crate::expand::{expand_aliases, unescape_str};
use crate::libsh::error::{Note, ShErr, ShErrKind};
use crate::parse::{
NdRule, Node, ParseStream,
lex::{LexFlags, LexStream, Tk, TkRule},
node_operation,
node_operation, NdRule, Node, ParseStream,
};
use crate::state::{write_logic, write_vars};

26
src/tests/readline.rs
View File

@@ -6,12 +6,12 @@ use crate::{
term::{Style, Styled},
},
prompt::readline::{
FernVi,
history::History,
keys::{KeyCode, KeyEvent, ModKeys},
linebuf::LineBuf,
term::{KeyReader, LineWriter, raw_mode},
term::{raw_mode, KeyReader, LineWriter},
vimode::{ViInsert, ViMode, ViNormal},
FernVi,
},
};
@@ -175,9 +175,9 @@ impl LineWriter for TestWriter {
Ok(())
}
fn send_bell(&mut self) -> ShResult<()> {
Ok(())
}
fn send_bell(&mut self) -> ShResult<()> {
Ok(())
}
}
// NOTE: FernVi structure has changed significantly and readline() method no
@@ -605,31 +605,27 @@ fn editor_delete_line_up() {
#[test]
fn editor_insert_at_line_start() {
// I should move cursor to position 0 when line starts with non-whitespace
assert_eq!(
normal_cmd("I", "hello world", 5),
("hello world".into(), 0)
);
assert_eq!(normal_cmd("I", "hello world", 5), ("hello world".into(), 0));
// I should skip leading whitespace
assert_eq!(
normal_cmd("I", " hello world", 8),
(" hello world".into(), 2)
);
// I should move to the first non-whitespace on the current line in a multiline buffer
// I should move to the first non-whitespace on the current line in a multiline
// buffer
assert_eq!(
normal_cmd("I", "first line\nsecond line", 14),
("first line\nsecond line".into(), 11)
);
// I should land on position 0 when cursor is already at 0
assert_eq!(
normal_cmd("I", "hello", 0),
("hello".into(), 0)
);
assert_eq!(normal_cmd("I", "hello", 0), ("hello".into(), 0));
}
#[test]
fn editor_f_char_from_position_zero() {
// f<char> at position 0 should skip the cursor and find the next occurrence
// Regression: previously at pos 0, f would match the char under the cursor itself
// Regression: previously at pos 0, f would match the char under the cursor
// itself
assert_eq!(
normal_cmd("fa", "abcaef", 0),
("abcaef".into(), 3) // should find second 'a', not the 'a' at position 0

2
src/tests/redir.rs
View File

@@ -1,8 +1,8 @@
use std::sync::Arc;
use crate::parse::{
NdRule, Node, ParseStream, Redir, RedirType,
lex::{LexFlags, LexStream},
NdRule, Node, ParseStream, Redir, RedirType,
};
use crate::procio::{IoFrame, IoMode, IoStack};

51
src/tests/state.rs
View File

@@ -1,5 +1,5 @@
use std::path::PathBuf;
use crate::state::{LogTab, MetaTab, ScopeStack, ShellParam, VarFlags, VarTab};
use std::path::PathBuf;
// ============================================================================
// ScopeStack Tests - Variable Scoping
@@ -11,8 +11,8 @@ fn scopestack_new() {
// Should start with one global scope
assert!(stack.var_exists("PATH") || !stack.var_exists("PATH")); // Just check
// it doesn't
// panic
// it doesn't
// panic
}
#[test]
@@ -296,13 +296,21 @@ fn scopestack_local_var_mutation() {
// `foo="bar"` — reassign without LOCAL flag (plain assignment)
stack.set_var("foo", "bar", VarFlags::NONE);
assert_eq!(stack.get_var("foo"), "bar", "Local var should be mutated in place");
assert_eq!(
stack.get_var("foo"),
"bar",
"Local var should be mutated in place"
);
// Ascend back to global
stack.ascend();
// foo should not exist in global scope
assert_eq!(stack.get_var("foo"), "", "Local var should not leak to global scope");
assert_eq!(
stack.get_var("foo"),
"",
"Local var should not leak to global scope"
);
}
#[test]
@@ -318,13 +326,21 @@ fn scopestack_local_var_uninitialized() {
// `foo="bar"` — assign a value later
stack.set_var("foo", "bar", VarFlags::NONE);
assert_eq!(stack.get_var("foo"), "bar", "Uninitialized local should be assignable");
assert_eq!(
stack.get_var("foo"),
"bar",
"Uninitialized local should be assignable"
);
// Ascend back to global
stack.ascend();
// foo should not exist in global scope
assert_eq!(stack.get_var("foo"), "", "Local var should not leak to global scope");
assert_eq!(
stack.get_var("foo"),
"",
"Local var should not leak to global scope"
);
}
// ============================================================================
@@ -740,11 +756,14 @@ fn dirstack_pushd_rotation_with_cwd() {
assert_eq!(new_cwd, Some(PathBuf::from("/var")));
let remaining: Vec<_> = meta.dirs().iter().collect();
assert_eq!(remaining, vec![
&PathBuf::from("/etc"),
&PathBuf::from("/home"),
&PathBuf::from("/tmp"),
]);
assert_eq!(
remaining,
vec![
&PathBuf::from("/etc"),
&PathBuf::from("/home"),
&PathBuf::from("/tmp"),
]
);
}
#[test]
@@ -821,10 +840,10 @@ fn dirstack_popd_plus_n_offset() {
assert_eq!(removed, Some(PathBuf::from("/var")));
let remaining: Vec<_> = meta.dirs().iter().collect();
assert_eq!(remaining, vec![
&PathBuf::from("/tmp"),
&PathBuf::from("/etc"),
]);
assert_eq!(
remaining,
vec![&PathBuf::from("/tmp"), &PathBuf::from("/etc"),]
);
}
#[test]