Skip to content
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

Include completions for git-ignored files in debugger prompt #7936

Merged
merged 1 commit into from
Aug 14, 2023
Merged

Include completions for git-ignored files in debugger prompt #7936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions helix-term/src/commands/dap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,12 @@ fn debug_parameter_prompt(
.to_owned();

let completer = match field_type {
"filename" => ui::completers::filename,
"directory" => ui::completers::directory,
"filename" => |editor: &Editor, input: &str| {
ui::completers::filename_with_git_ignore(editor, input, false)
},
"directory" => |editor: &Editor, input: &str| {
ui::completers::directory_with_git_ignore(editor, input, false)
},
_ => ui::completers::none,
};

Expand Down
28 changes: 25 additions & 3 deletions helix-term/src/ui/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,15 @@ pub mod completers {
}

pub fn filename(editor: &Editor, input: &str) -> Vec<Completion> {
filename_impl(editor, input, |entry| {
filename_with_git_ignore(editor, input, true)
}

pub fn filename_with_git_ignore(
editor: &Editor,
input: &str,
git_ignore: bool,
) -> Vec<Completion> {
filename_impl(editor, input, git_ignore, |entry| {
let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());

if is_dir {
Expand Down Expand Up @@ -416,7 +424,15 @@ pub mod completers {
}

pub fn directory(editor: &Editor, input: &str) -> Vec<Completion> {
filename_impl(editor, input, |entry| {
directory_with_git_ignore(editor, input, true)
}

pub fn directory_with_git_ignore(
editor: &Editor,
input: &str,
git_ignore: bool,
) -> Vec<Completion> {
filename_impl(editor, input, git_ignore, |entry| {
let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());

if is_dir {
Expand All @@ -439,7 +455,12 @@ pub mod completers {
}

// TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
fn filename_impl<F>(_editor: &Editor, input: &str, filter_fn: F) -> Vec<Completion>
fn filename_impl<F>(
_editor: &Editor,
input: &str,
git_ignore: bool,
filter_fn: F,
) -> Vec<Completion>
where
F: Fn(&ignore::DirEntry) -> FileMatch,
{
Expand Down Expand Up @@ -482,6 +503,7 @@ pub mod completers {
let mut files: Vec<_> = WalkBuilder::new(&dir)
.hidden(false)
.follow_links(false) // We're scanning over depth 1
.git_ignore(git_ignore)
.max_depth(Some(1))
.build()
.filter_map(|file| {
Expand Down