h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-03 15:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

wildcard: use "zelf" over "this" for consistency

Browse Source 
The following "Port execution" commit will add lots of variables called "zelf".
This commit is contained in:
Johannes Altmanninger
2023-10-07 22:31:44 +02:00
parent 6ef5ae0935
commit 0b25793097
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fish-rust/src/wildcard.rs
View File

@@ -819,8 +819,8 @@ fn expand_literal_intermediate_segment_with_fuzz(
prefix: &wstr,
) {
// Mark that we are fuzzy for the duration of this function
let mut this = scoped_push(self, |e| &mut e.has_fuzzy_ancestor, true);
while !this.interrupted_or_overflowed() {
let mut zelf = scoped_push(self, |e| &mut e.has_fuzzy_ancestor, true);
while !zelf.interrupted_or_overflowed() {
let Some(Ok(entry)) = base_dir_iter.next() else {
break;
};
@@ -851,12 +851,12 @@ fn expand_literal_intermediate_segment_with_fuzz(
let new_full_path: WString = base_dir.to_owned() + entry.name.as_utfstr() + L!("/");
// Ok, this directory matches. Recurse to it. Then mark each resulting completion as fuzzy.
let before = this.resolved_completions.len();
this.expand(&new_full_path, wc_remainder, &child_prefix);
let after = this.resolved_completions.len();
let before = zelf.resolved_completions.len();
zelf.expand(&new_full_path, wc_remainder, &child_prefix);
let after = zelf.resolved_completions.len();
assert!(before <= after);
for c in this.resolved_completions[before..after].iter_mut() {
for c in zelf.resolved_completions[before..after].iter_mut() {
// Mark the completion as replacing.
if !c.replaces_token() {
c.flags |= CompleteFlags::REPLACES_TOKEN;