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

Remove the abbreviation cache

Browse Source 
Read abbreviations directly from the environment.
This commit is contained in:
ridiculousfish
2018-09-24 01:47:38 -04:00
parent 9f62a53077
commit 038f3cca6d
6 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/reader.cpp
View File

@@ -747,14 +747,13 @@ bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t curso
bool result = false;
if (matching_cmd_node) {
const wcstring token = matching_cmd_node.get_source(subcmd);
wcstring abbreviation;
if (expand_abbreviation(token, &abbreviation)) {
if (auto abbreviation = expand_abbreviation(token)) {
// There was an abbreviation! Replace the token in the full command. Maintain the
// relative position of the cursor.
if (output != NULL) {
output->assign(cmdline);
source_range_t r = *matching_cmd_node.source_range();
output->replace(subcmd_offset + r.start, r.length, abbreviation);
output->replace(subcmd_offset + r.start, r.length, *abbreviation);
}
result = true;
}