suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve %% escaping error message (#13018)

pull/13024/head
Alexander Brassel 2025-03-04 08:03:11 -08:00 committed by GitHub
parent 9440feae7c
commit 82f8ac208f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helix-core/src/command_line.rs
View File

@ -223,8 +223,12 @@ impl fmt::Display for ParseArgsError<'_> {
write!(f, "flag '--{flag}' missing an argument") write!(f, "flag '--{flag}' missing an argument")
} }
Self::MissingExpansionDelimiter { expansion } => { Self::MissingExpansionDelimiter { expansion } => {
if expansion.is_empty() {
write!(f, "'%' was not properly escaped. Please use '%%'")
} else {
write!(f, "missing a string delimiter after '%{expansion}'") write!(f, "missing a string delimiter after '%{expansion}'")
} }
}
Self::UnknownExpansion { kind } => { Self::UnknownExpansion { kind } => {
write!(f, "unknown expansion '{kind}'") write!(f, "unknown expansion '{kind}'")
} }

11
helix-term/tests/test/command_line.rs
View File

@ -90,3 +90,14 @@ async fn shell_expansion() -> anyhow::Result<()> {
Ok(()) Ok(())
} }
#[tokio::test(flavor = "multi_thread")]
async fn percent_escaping() -> anyhow::Result<()> {
test_statusline(
r#":sh echo hello 10%"#,
"'run-shell-command': '%' was not properly escaped. Please use '%%'",
Severity::Error,
)
.await?;
Ok(())
}