h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 19:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix to prevent autosuggesting cd'ing to the current working directory

Browse Source
This commit is contained in:
ridiculousfish
2012-02-18 21:56:30 -08:00
parent 14b3a5be56
commit ca1c8243c8
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
highlight.cpp
View File

@@ -562,9 +562,19 @@ bool autosuggest_handle_special(const wcstring &str, const env_vars &vars, const
/* We can specially handle the cd command */
handled = true;
bool is_help = string_prefixes_string(dir, L"--help") || string_prefixes_string(dir, L"-h");
if (! is_help && ! path_can_get_cdpath(dir, working_directory.c_str())) {
if (is_help) {
suggestionOK = false;
break;
} else {
wchar_t *path = path_allocate_cdpath(dir.c_str(), working_directory.c_str());
if (path == NULL) {
suggestionOK = false;
} else if (paths_are_same_file(working_directory, path)) {
/* Don't suggest the working directory as the path! */
suggestionOK = false;
} else {
suggestionOK = true;
}
free(path);
}
}
}