git.iko.soy/helix
on master help sign in
Fix whitespace handling in command-mode completion
1536a65Michael Davis
helix-core/src/shellwords.rs+74−10
compare with master
unifiedsplit
@@ -17,18 +17,18 @@ pub fn escape(input: &str) -> Cow<'_, str> {
17 }
17 }
18}
18}
19
19
20+enum State {
21+ OnWhitespace,
22+ Unquoted,
23+ UnquotedEscaped,
24+ Quoted,
25+ QuoteEscaped,
26+ Dquoted,
27+ DquoteEscaped,
28+}
29+
20/// Get the vec of escaped / quoted / doublequoted filenames from the input str
30/// Get the vec of escaped / quoted / doublequoted filenames from the input str
21pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
31pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
22− enum State {
23− OnWhitespace,
24− Unquoted,
25− UnquotedEscaped,
26− Quoted,
27− QuoteEscaped,
28− Dquoted,
29− DquoteEscaped,
30− }
31−
32 use State::*;
32 use State::*;
33
33
34 let mut state = Unquoted;
34 let mut state = Unquoted;
@@ -140,6 +140,70 @@ pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
140 args
140 args
141}
141}
142
142
143+/// Checks that the input ends with an ascii whitespace character which is
144+/// not escaped.
145+///
146+/// # Examples
147+///
148+/// ```rust
149+/// use helix_core::shellwords::ends_with_whitespace;
150+/// assert_eq!(ends_with_whitespace(" "), true);
151+/// assert_eq!(ends_with_whitespace(":open "), true);
152+/// assert_eq!(ends_with_whitespace(":open foo.txt "), true);
153+/// assert_eq!(ends_with_whitespace(":open"), false);
154+/// #[cfg(unix)]
155+/// assert_eq!(ends_with_whitespace(":open a\\ "), false);
156+/// #[cfg(unix)]
157+/// assert_eq!(ends_with_whitespace(":open a\\ b.txt"), false);
158+/// ```
159+pub fn ends_with_whitespace(input: &str) -> bool {
160+ use State::*;
161+
162+ // Fast-lane: the input must end with a whitespace character
163+ // regardless of quoting.
164+ if !input.ends_with(|c: char| c.is_ascii_whitespace()) {
165+ return false;
166+ }
167+
168+ let mut state = Unquoted;
169+
170+ for c in input.chars() {
171+ state = match state {
172+ OnWhitespace => match c {
173+ '"' => Dquoted,
174+ '\'' => Quoted,
175+ '\\' if cfg!(unix) => UnquotedEscaped,
176+ '\\' => OnWhitespace,
177+ c if c.is_ascii_whitespace() => OnWhitespace,
178+ _ => Unquoted,
179+ },
180+ Unquoted => match c {
181+ '\\' if cfg!(unix) => UnquotedEscaped,
182+ '\\' => Unquoted,
183+ c if c.is_ascii_whitespace() => OnWhitespace,
184+ _ => Unquoted,
185+ },
186+ UnquotedEscaped => Unquoted,
187+ Quoted => match c {
188+ '\\' if cfg!(unix) => QuoteEscaped,
189+ '\\' => Quoted,
190+ '\'' => OnWhitespace,
191+ _ => Quoted,
192+ },
193+ QuoteEscaped => Quoted,
194+ Dquoted => match c {
195+ '\\' if cfg!(unix) => DquoteEscaped,
196+ '\\' => Dquoted,
197+ '"' => OnWhitespace,
198+ _ => Dquoted,
199+ },
200+ DquoteEscaped => Dquoted,
201+ }
202+ }
203+
204+ matches!(state, OnWhitespace)
205+}
206+
143#[cfg(test)]
207#[cfg(test)]
144mod test {
208mod test {
145 use super::*;
209 use super::*;
helix-term/src/commands/typed.rs+12−6
@@ -2183,10 +2183,11 @@ pub(super) fn command_mode(cx: &mut Context) {
2183 static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
2183 static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
2184 Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
2184 Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
2185
2185
2186− // simple heuristic: if there's no just one part, complete command name.
2186+ let parts = shellwords::shellwords(input);
2187− // if there's a space, per command completion kicks in.
2187+ let ends_with_whitespace = shellwords::ends_with_whitespace(input);
2188− // we use .this over split_whitespace() because we care about empty segments
2188+
2189− if input.split(' ').count() <= 1 {
2189+ if parts.is_empty() || (parts.len() == 1 && !ends_with_whitespace) {
2190+ // If the command has not been finished yet, complete commands.
2190 let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
2191 let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
2191 .iter()
2192 .iter()
2192 .filter_map(|command| {
2193 .filter_map(|command| {
@@ -2202,8 +2203,13 @@ pub(super) fn command_mode(cx: &mut Context) {
2202 .map(|(name, _)| (0.., name.into()))
2203 .map(|(name, _)| (0.., name.into()))
2203 .collect()
2204 .collect()
2204 } else {
2205 } else {
2205− let parts = shellwords::shellwords(input);
2206+ // Otherwise, use the command's completer and the last shellword
2207+ // as completion input.
2208+ let part = if parts.len() == 1 {
2209+ &Cow::Borrowed("")
2210+ } else {
2206− let part = parts.last().unwrap();
2211+ parts.last().unwrap()
2212+ };
2207
2213
2208 if let Some(typed::TypableCommand {
2214 if let Some(typed::TypableCommand {
2209 completer: Some(completer),
2215 completer: Some(completer),