Skip to content

Make default completer work on blank lines #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make default completer work on blank lines #923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c65aaf3
Make default completer work on blank lines
ysthakur Jun 13, 2025
25a76ad
Throw in a blank line in the doctest
ysthakur Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions src/completion/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,47 @@ impl Completer for DefaultCompleter {
/// assert_eq!(
/// completions.complete("bat",3),
/// vec![
/// Suggestion {value: "batcave".into(), description: None, style: None, extra: None, span: Span { start: 0, end: 3 }, append_whitespace: false},
/// Suggestion {value: "batman".into(), description: None, style: None, extra: None, span: Span { start: 0, end: 3 }, append_whitespace: false},
/// Suggestion {value: "batmobile".into(), description: None, style: None, extra: None, span: Span { start: 0, end: 3 }, append_whitespace: false},
/// Suggestion {value: "batcave".into(), span: Span { start: 0, end: 3 }, ..Default::default()},
/// Suggestion {value: "batman".into(), span: Span { start: 0, end: 3 }, ..Default::default()},
/// Suggestion {value: "batmobile".into(), span: Span { start: 0, end: 3 }, ..Default::default()},
/// ]);
///
/// assert_eq!(
/// completions.complete("to the\r\nbat",11),
/// vec![
/// Suggestion {value: "batcave".into(), description: None, style: None, extra: None, span: Span { start: 8, end: 11 }, append_whitespace: false},
/// Suggestion {value: "batman".into(), description: None, style: None, extra: None, span: Span { start: 8, end: 11 }, append_whitespace: false},
/// Suggestion {value: "batmobile".into(), description: None, style: None, extra: None, span: Span { start: 8, end: 11 }, append_whitespace: false},
/// Suggestion {value: "batcave".into(), span: Span { start: 8, end: 11 }, ..Default::default()},
/// Suggestion {value: "batman".into(), span: Span { start: 8, end: 11 }, ..Default::default()},
/// Suggestion {value: "batmobile".into(), span: Span { start: 8, end: 11 }, ..Default::default()},
/// ]);
///
/// assert_eq!(
/// completions.complete("", 0),
/// vec![
/// Suggestion {value: "batcave".into(), span: Span { start: 0, end: 0 }, ..Default::default()},
/// Suggestion {value: "batman".into(), span: Span { start: 0, end: 0 }, ..Default::default()},
/// Suggestion {value: "batmobile".into(), span: Span { start: 0, end: 0 }, ..Default::default()},
/// Suggestion {value: "robber".into(), span: Span { start: 0, end: 0 }, ..Default::default()},
/// Suggestion {value: "robin".into(), span: Span { start: 0, end: 0 }, ..Default::default()},
/// ]);
/// ```
fn complete(&mut self, line: &str, pos: usize) -> Vec<Suggestion> {
let mut span_line_whitespaces = 0;
let mut completions = vec![];
// Trimming in case someone passes in text containing stuff after the cursor, if
// `only_buffer_difference` is false
let line = if line.len() > pos { &line[..pos] } else { line };
if !line.is_empty() {
if line.chars().all(|c| c == ' ') {
self.root
.complete("".chars())
.unwrap_or_default()
.into_iter()
.map(|value| Suggestion {
value,
span: Span::new(pos, pos),
..Default::default()
})
.collect()
} else {
let mut completions = vec![];
// When editing a multiline buffer, there can be new line characters in it.
// Also, by replacing the new line character with a space, the insert
// position is maintain in the line buffer.
Expand Down Expand Up @@ -105,22 +126,18 @@ impl Completer for DefaultCompleter {

Suggestion {
value: format!("{span_line}{ext}"),
description: None,
style: None,
extra: None,
span,
append_whitespace: false,
..Default::default()
}
})
.filter(|t| t.value.len() > (t.span.end - t.span.start))
.collect::<Vec<Suggestion>>(),
.filter(|t| t.value.len() > (t.span.end - t.span.start)),
);
}
}
}
completions.dedup();
completions
}
completions.dedup();
completions
}
}

Expand Down