Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-31 23:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Default some ivars in wildcard_expander_t

Browse source
This commit is contained in:
ridiculousfish 2020-01-15 11:43:10 -08:00
parent 5f130c2d6d
commit 4f01eef88d
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wildcard.cpp
View file

@ -465,13 +465,13 @@ class wildcard_expander_t {
// Resolved items get inserted into here. This is transient of course. // Resolved items get inserted into here. This is transient of course.
std::vector<completion_t> *resolved_completions; std::vector<completion_t> *resolved_completions;
// Whether we have been interrupted. // Whether we have been interrupted.
bool did_interrupt; bool did_interrupt{false};
// Whether we have successfully added any completions. // Whether we have successfully added any completions.
bool did_add; bool did_add{false};
// Whether some parent expansion is fuzzy, and therefore completions always prepend their prefix // Whether some parent expansion is fuzzy, and therefore completions always prepend their prefix
// This variable is a little suspicious - it should be passed along, not stored here // This variable is a little suspicious - it should be passed along, not stored here
// If we ever try to do parallel wildcard expansion we'll have to remove this // If we ever try to do parallel wildcard expansion we'll have to remove this
bool has_fuzzy_ancestor; bool has_fuzzy_ancestor{false};
/// We are a trailing slash - expand at the end. /// We are a trailing slash - expand at the end.
void expand_trailing_slash(const wcstring &base_dir, const wcstring &prefix); void expand_trailing_slash(const wcstring &base_dir, const wcstring &prefix);
@ -628,12 +628,7 @@ class wildcard_expander_t {
public: public:
wildcard_expander_t(wcstring wd, expand_flags_t f, std::vector<completion_t> *r) wildcard_expander_t(wcstring wd, expand_flags_t f, std::vector<completion_t> *r)
: working_directory(std::move(wd)), : working_directory(std::move(wd)), flags(f), resolved_completions(r) {
flags(f),
resolved_completions(r),
did_interrupt(false),
did_add(false),
has_fuzzy_ancestor(false) {
assert(resolved_completions != nullptr); assert(resolved_completions != nullptr);
// Insert initial completions into our set to avoid duplicates. // Insert initial completions into our set to avoid duplicates.