mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix parsing environment variable

Browse source
This commit is contained in:
Nguyen Duc Toan 2023-09-24 23:57:52 +07:00 • committed by sxyazi
parent 7a1cedd555
commit 7c70ce9fee
No known key found for this signature in database
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/src/external/shell.rs vendored
View file

@ -63,7 +63,15 @@ pub fn shell(opt: ShellOpt) -> Result<Child> {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
mod cmdexpand { mod cmdexpand {
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use nom::{branch::alt, bytes::complete::{is_not, tag, take_while1}, character::complete::{anychar, char, digit1, space0, space1}, combinator::recognize, multi::{many0, many1}, sequence::{delimited, pair, preceded, tuple}, IResult}; use nom::{
branch::alt,
bytes::complete::{is_not, tag, take_while1},
character::complete::{alpha1, alphanumeric0, anychar, char, digit1, space0, space1},
combinator::recognize,
multi::{many0, many1},
sequence::{delimited, pair, preceded, tuple},
IResult,
};
enum CommandPart<'a> { enum CommandPart<'a> {
Space(&'a str), Space(&'a str),
@ -181,6 +189,15 @@ mod cmdexpand {
} }
fn parse_text(text: &str) -> Result<Vec<TextPart>> { fn parse_text(text: &str) -> Result<Vec<TextPart>> {
fn variable_name(input: &str) -> IResult<&str, &str> {
recognize(pair(alt((alpha1, tag("_"))), alt((alphanumeric0, tag("_")))))(input)
}
fn variable_placeholder(input: &str) -> IResult<&str, TextPart> {
let (input, output) = recognize(tuple((char('%'), variable_name, char('%'))))(input)?;
Ok((input, TextPart::NormalText(output)))
}
fn normal_text(input: &str) -> IResult<&str, TextPart> { fn normal_text(input: &str) -> IResult<&str, TextPart> {
let (input, output) = recognize(many1(alt((escaped_char, is_not("\\%")))))(input)?; let (input, output) = recognize(many1(alt((escaped_char, is_not("\\%")))))(input)?;
Ok((input, TextPart::NormalText(output))) Ok((input, TextPart::NormalText(output)))
@ -197,7 +214,8 @@ mod cmdexpand {
Ok((input, TextPart::PercentNumber(num))) Ok((input, TextPart::PercentNumber(num)))
} }
let (_, parts) = many0(alt((normal_text, percent_star, percent_number)))(text) let (_, parts) =
many0(alt((normal_text, percent_star, percent_number, variable_placeholder)))(text)
.map_err(|_| anyhow!("Cannot parse text `{text}`"))?; .map_err(|_| anyhow!("Cannot parse text `{text}`"))?;
Ok(parts) Ok(parts)
} }