github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-12-23 00:43:39 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: check whether a function is tombstoned during highlight

Browse Source 
exists_no_autoload() wrongly thinks that tombstoned functions can be
autoloaded; fix that.

While at-it replace the use of get_props() with something simpler.

Co-authored-by: Himadri Bhattacharjee

Closes #10873
This commit is contained in:
Johannes Altmanninger 2024-11-27 08:38:10 +01:00
parent c625a324ba
commit 644171fac6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/function.rs
View File

@ -241,7 +241,8 @@ pub fn exists_no_autoload(cmd: &wstr) -> bool {
} }
let mut funcset = FUNCTION_SET.lock().unwrap(); let mut funcset = FUNCTION_SET.lock().unwrap();
// Check if we either have the function, or it could be autoloaded. // Check if we either have the function, or it could be autoloaded.
funcset.get_props(cmd).is_some() || funcset.autoloader.can_autoload(cmd) let tombstoned = funcset.autoload_tombstones.contains(cmd);
funcset.funcs.contains_key(cmd) || (!tombstoned && funcset.autoloader.can_autoload(cmd))
} }
/// Remove the function with the specified name. /// Remove the function with the specified name.