aboutsummaryrefslogtreecommitdiff
path: root/helix-core
diff options
context:
space:
mode:
authorMichael Davis2022-11-04 01:58:54 +0000
committerBlaž Hrastnik2022-11-07 04:38:16 +0000
commit3d283b2ca43bb077f52c48fec5e4870cd314b4e3 (patch)
treec95f608404ce5da069688eb0ccf9d196cadbcc31 /helix-core
parent1536a6528968f38adfac2e991b29006f5ded5968 (diff)
Escape filenames in command completion
This changes the completion items to be rendered with shellword escaping, so a file `a b.txt` is rendered as `a\ b.txt` which matches how it should be inputted.
Diffstat (limited to 'helix-core')
-rw-r--r--helix-core/src/shellwords.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index 3375bef1..7742896c 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -1,9 +1,9 @@
use std::borrow::Cow;
/// Auto escape for shellwords usage.
-pub fn escape(input: &str) -> Cow<'_, str> {
+pub fn escape(input: Cow<str>) -> Cow<str> {
if !input.chars().any(|x| x.is_ascii_whitespace()) {
- Cow::Borrowed(input)
+ input
} else if cfg!(unix) {
Cow::Owned(input.chars().fold(String::new(), |mut buf, c| {
if c.is_ascii_whitespace() {
@@ -311,15 +311,15 @@ mod test {
#[test]
#[cfg(unix)]
fn test_escaping_unix() {
- assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));
- assert_eq!(escape("foo bar"), Cow::Borrowed("foo\\ bar"));
- assert_eq!(escape("foo\tbar"), Cow::Borrowed("foo\\\tbar"));
+ assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
+ assert_eq!(escape("foo bar".into()), Cow::Borrowed("foo\\ bar"));
+ assert_eq!(escape("foo\tbar".into()), Cow::Borrowed("foo\\\tbar"));
}
#[test]
#[cfg(windows)]
fn test_escaping_windows() {
- assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));
- assert_eq!(escape("foo bar"), Cow::Borrowed("\"foo bar\""));
+ assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
+ assert_eq!(escape("foo bar".into()), Cow::Borrowed("\"foo bar\""));
}
}