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

reader: Stop converting to wchar and back to wcstring

Browse Source 
This called completion_insert with a wchar_t*, which was then passed
to a function that takes a wcstring.
This commit is contained in:
Fabian Homborg 2020-11-15 15:24:37 +01:00
parent 263ef55ae6
commit 3c14d310a0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/reader.cpp
View File

@ -647,7 +647,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
void select_completion_in_direction(selection_motion_t dir); void select_completion_in_direction(selection_motion_t dir);
void flash(); void flash();
void completion_insert(const wchar_t *val, size_t token_end, complete_flags_t flags); void completion_insert(const wcstring &val, size_t token_end, complete_flags_t flags);
bool can_autosuggest() const; bool can_autosuggest() const;
void autosuggest_completed(autosuggestion_result_t result); void autosuggest_completed(autosuggestion_result_t result);
@ -1543,7 +1543,7 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
/// \param token_end the position after the token to complete /// \param token_end the position after the token to complete
/// \param flags A union of all flags describing the completion to insert. See the completion_t /// \param flags A union of all flags describing the completion to insert. See the completion_t
/// struct for more information on possible values. /// struct for more information on possible values.
void reader_data_t::completion_insert(const wchar_t *val, size_t token_end, void reader_data_t::completion_insert(const wcstring &val, size_t token_end,
complete_flags_t flags) { complete_flags_t flags) {
editable_line_t *el = active_edit_line(); editable_line_t *el = active_edit_line();
@ -1830,7 +1830,7 @@ bool reader_data_t::handle_completions(const completion_list_t &comp, size_t tok
// If this is a replacement completion, check that we know how to replace it, e.g. that // If this is a replacement completion, check that we know how to replace it, e.g. that
// the token doesn't contain evil operators like {}. // the token doesn't contain evil operators like {}.
if (!(c.flags & COMPLETE_REPLACES_TOKEN) || reader_can_replace(tok, c.flags)) { if (!(c.flags & COMPLETE_REPLACES_TOKEN) || reader_can_replace(tok, c.flags)) {
completion_insert(c.completion.c_str(), token_end, c.flags); completion_insert(c.completion, token_end, c.flags);
} }
done = true; done = true;
success = true; success = true;
@ -1919,7 +1919,7 @@ bool reader_data_t::handle_completions(const completion_list_t &comp, size_t tok
// We got something. If more than one completion contributed, then it means we have // We got something. If more than one completion contributed, then it means we have
// a prefix; don't insert a space after it. // a prefix; don't insert a space after it.
if (prefix_is_partial_completion) flags |= COMPLETE_NO_SPACE; if (prefix_is_partial_completion) flags |= COMPLETE_NO_SPACE;
completion_insert(common_prefix.c_str(), token_end, flags); completion_insert(common_prefix, token_end, flags);
cycle_command_line = command_line.text(); cycle_command_line = command_line.text();
cycle_cursor_pos = command_line.position(); cycle_cursor_pos = command_line.position();
} }