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

Minor simplification of history

Browse Source
This commit is contained in:
Peter Ammon
2025-12-23 08:33:29 -08:00
parent 3c7517bf28
commit 41571dec0f
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/history/history.rs
View File

@@ -1256,7 +1256,7 @@ pub fn remove_ephemeral_items(&self) {
/// determine which arguments are paths. Arguments may be expanded (e.g. with PWD and variables)
/// using the given `vars`. The item has the given `persist_mode`.
pub fn add_pending_with_file_detection(
self: Arc<Self>,
self: &Arc<Self>,
s: &wstr,
vars: &EnvStack,
persist_mode: PersistenceMode, /*=disk*/
@@ -1318,10 +1318,11 @@ pub fn add_pending_with_file_detection(
let thread_pool = Arc::clone(&imp.thread_pool);
drop(imp);
let vars_snapshot = vars.snapshot();
let self_clone = Arc::clone(self);
thread_pool.perform(move || {
// Don't hold the lock while we perform this file detection.
let valid_file_paths = expand_and_detect_paths(potential_paths, &vars_snapshot);
let mut imp = self.imp();
let mut imp = self_clone.imp();
if !valid_file_paths.is_empty() {
imp.set_valid_file_paths(valid_file_paths, &snapshot_item);
}
@@ -2275,47 +2276,47 @@ fn test_history_path_detection() {
let history = History::with_name(L!("path_detection"));
history.clear();
assert_eq!(history.size(), 0);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
L!("cmd0 not/a/valid/path"),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
&(L!("cmd1 ").to_owned() + filename),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
&(L!("cmd2 ").to_owned() + &wfile_path[..]),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
&(L!("cmd3 $HOME/").to_owned() + filename),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
L!("cmd4 $HOME/notafile"),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
&(L!("cmd5 ~/").to_owned() + filename),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
L!("cmd6 ~/notafile"),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
L!("cmd7 ~/*f*"),
&test_vars,
PersistenceMode::Disk,
);
history.clone().add_pending_with_file_detection(
history.add_pending_with_file_detection(
L!("cmd8 ~/*zzz*"),
&test_vars,
PersistenceMode::Disk,

7
src/reader/reader.rs
View File

@@ -6113,11 +6113,8 @@ fn add_to_history(&mut self) {
} else {
PersistenceMode::Disk
};
self.history.clone().add_pending_with_file_detection(
&text,
&self.parser.variables,
mode,
);
self.history
.add_pending_with_file_detection(&text, &self.parser.variables, mode);
}
}