summaryrefslogtreecommitdiff
path: root/helix-term/src/ui/prompt.rs
diff options
context:
space:
mode:
authorArmin Ronacher2022-11-01 11:48:37 +0000
committerGitHub2022-11-01 11:48:37 +0000
commit8584b38cfbe6ffe3e5d539ad953c413e44e90bfa (patch)
treed2013dc542e6d1c15468b0357ffba509cb1285a0 /helix-term/src/ui/prompt.rs
parent3881fef39d01c94a09b8f5da67decc2c3ccb3660 (diff)
Correctly handle escaping in completion (#4316)
* Correctly handle escaping in completion * Added escaping tests
Diffstat (limited to 'helix-term/src/ui/prompt.rs')
-rw-r--r--helix-term/src/ui/prompt.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index db3bd62d..d0991d3c 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -1,5 +1,6 @@
use crate::compositor::{Component, Compositor, Context, Event, EventResult};
use crate::{alt, ctrl, key, shift, ui};
+use helix_core::shellwords;
use helix_view::input::KeyEvent;
use helix_view::keyboard::KeyCode;
use std::{borrow::Cow, ops::RangeFrom};
@@ -335,7 +336,10 @@ impl Prompt {
let (range, item) = &self.completion[index];
- self.line.replace_range(range.clone(), item);
+ // since we are using shellwords to parse arguments, make sure
+ // that whitespace in files is properly escaped.
+ let item = shellwords::escape(item);
+ self.line.replace_range(range.clone(), &item);
self.move_end();
}