github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

reader: Some light stringification

Browse Source
This commit is contained in:
Fabian Homborg 2022-03-25 15:22:59 +01:00
parent f98398b418
commit fa1ecb8c67
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/reader.cpp
View File

@ -1941,17 +1941,12 @@ const wchar_t *REPLACE_UNCLEAN = L"$*?({})";
/// other than if the new token is already an exact replacement, e.g. if the COMPLETE_DONT_ESCAPE /// other than if the new token is already an exact replacement, e.g. if the COMPLETE_DONT_ESCAPE
/// flag is set. /// flag is set.
static bool reader_can_replace(const wcstring &in, int flags) { static bool reader_can_replace(const wcstring &in, int flags) {
const wchar_t *str = in.c_str();
if (flags & COMPLETE_DONT_ESCAPE) { if (flags & COMPLETE_DONT_ESCAPE) {
return true; return true;
} }
// Test characters that have a special meaning in any character position. // Test characters that have a special meaning in any character position.
while (*str) { if (in.find_first_of(REPLACE_UNCLEAN) != wcstring::npos) return false;
if (std::wcschr(REPLACE_UNCLEAN, *str)) return false;
str++;
}
return true; return true;
} }
@ -1986,7 +1981,7 @@ bool reader_data_t::handle_completions(const completion_list_t &comp, size_t tok
bool success = false; bool success = false;
const editable_line_t *el = &command_line; const editable_line_t *el = &command_line;
const wcstring tok(el->text().c_str() + token_begin, token_end - token_begin); const wcstring tok(el->text(), token_begin, token_end - token_begin);
// Check trivial cases. // Check trivial cases.
size_t size = comp.size(); size_t size = comp.size();