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

Fixed prompt not automatically getting PSR value

Browse Source
This commit is contained in:
pagedmov
2026-02-25 17:58:39 -05:00
parent 8c003f54e2
commit e214f8b6b5
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/prompt/readline/mod.rs
View File

@@ -145,19 +145,15 @@ impl Prompt {
let Ok(ps1_expanded) = expand_prompt(&ps1_raw) else { let Ok(ps1_expanded) = expand_prompt(&ps1_raw) else {
return Self::default(); return Self::default();
}; };
let psr_raw = env::var("PSR").ok();
let psr_expanded = psr_raw.clone().map(|r| expand_prompt(&r)).transpose().ok().flatten();
Self { Self {
ps1_expanded, ps1_expanded,
ps1_raw, ps1_raw,
psr_expanded: None, psr_expanded,
psr_raw: None, psr_raw,
} }
} }
pub fn with_psr(mut self, psr_raw: String) -> ShResult<Self> {
let psr_expanded = expand_prompt(&psr_raw)?;
self.psr_expanded = Some(psr_expanded);
self.psr_raw = Some(psr_raw);
Ok(self)
}
pub fn get_ps1(&self) -> &str { pub fn get_ps1(&self) -> &str {
&self.ps1_expanded &self.ps1_expanded
@@ -517,6 +513,7 @@ impl ShedVi {
let new_layout = self.get_layout(&line); let new_layout = self.get_layout(&line);
let pending_seq = self.mode.pending_seq(); let pending_seq = self.mode.pending_seq();
let mut prompt_string_right = self.prompt.psr_expanded.clone(); let mut prompt_string_right = self.prompt.psr_expanded.clone();
log::debug!("prompt_string_right before truncation: {prompt_string_right:?}");
if prompt_string_right.as_ref().is_some_and(|psr| psr.lines().count() > 1) { if prompt_string_right.as_ref().is_some_and(|psr| psr.lines().count() > 1) {
log::warn!("PSR has multiple lines, truncating to one line"); log::warn!("PSR has multiple lines, truncating to one line");