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

autoload: remove code clone

Browse Source
This commit is contained in:
Johannes Altmanninger
2025-05-28 13:31:24 +02:00
parent b3dbdb90c2
commit f88f7e8dd6
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/autoload.rs
View File

@@ -100,35 +100,29 @@ pub fn resolve_command(&mut self, cmd: &wstr, env: &dyn Environment) -> Option<A
use crate::wchar_ext::WExt;
let mut possible_path = None;
if let Some(var) = env.get(self.env_var_name) {
match self.resolve_command_impl(cmd, var.as_list()) {
AutoloadResult::Path(path) => {
crate::FLOGF!(autoload, "Loading from path with var: %ls", path);
// HACK: Ignore generated_completions until we tried the embedded assets
if path
.find("/generated_completions/".chars().collect::<Vec<_>>())
.is_some()
{
possible_path = Some(path);
} else {
return Some(AutoloadPath::Path(path));
}
}
AutoloadResult::Loaded => return None,
AutoloadResult::Pending => return None,
AutoloadResult::None => (),
};
} else {
match self.resolve_command_impl(cmd, &[]) {
AutoloadResult::Path(path) => {
crate::FLOGF!(autoload, "Loading from path with var: %ls", path);
match self.resolve_command_impl(
cmd,
env.get(self.env_var_name)
.as_ref()
.map(|var| var.as_list())
.unwrap_or_default(),
) {
AutoloadResult::Path(path) => {
crate::FLOGF!(autoload, "Loading from path with var: %ls", path);
// HACK: Ignore generated_completions until we tried the embedded assets
if path
.find("/generated_completions/".chars().collect::<Vec<_>>())
.is_some()
{
possible_path = Some(path);
} else {
return Some(AutoloadPath::Path(path));
}
AutoloadResult::Loaded => return None,
AutoloadResult::Pending => return None,
AutoloadResult::None => (),
};
}
}
AutoloadResult::Loaded => return None,
AutoloadResult::Pending => return None,
AutoloadResult::None => (),
};
// HACK: In cargo tests, this used to never load functions
// It will hang for reasons unrelated to this.