Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use unique_ptr in builtin_commandline_scoped_transient_t

Browse source 
Allows removing a manual call to delete
This commit is contained in:
ridiculousfish 2017-01-21 15:45:38 -08:00
parent 3272505891
commit 3139ad0d4d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/complete.cpp
View file

@ -1450,7 +1450,7 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
// transient commandline for builtin_commandline. But not for // transient commandline for builtin_commandline. But not for
// COMPLETION_REQUEST_AUTOSUGGESTION, which may occur on background // COMPLETION_REQUEST_AUTOSUGGESTION, which may occur on background
// threads. // threads.
builtin_commandline_scoped_transient_t *transient_cmd = NULL; std::unique_ptr<builtin_commandline_scoped_transient_t> transient_cmd;
if (i == 0) { if (i == 0) {
assert(wrap_chain.at(i) == current_command_unescape); assert(wrap_chain.at(i) == current_command_unescape);
} else if (!(flags & COMPLETION_REQUEST_AUTOSUGGESTION)) { } else if (!(flags & COMPLETION_REQUEST_AUTOSUGGESTION)) {
@ -1458,15 +1458,13 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
wcstring faux_cmdline = cmd; wcstring faux_cmdline = cmd;
faux_cmdline.replace(cmd_node->source_start, faux_cmdline.replace(cmd_node->source_start,
cmd_node->source_length, wrap_chain.at(i)); cmd_node->source_length, wrap_chain.at(i));
transient_cmd = transient_cmd = make_unique<builtin_commandline_scoped_transient_t>(faux_cmdline);
new builtin_commandline_scoped_transient_t(faux_cmdline);
} }
if (!completer.complete_param(wrap_chain.at(i), if (!completer.complete_param(wrap_chain.at(i),
previous_argument_unescape, previous_argument_unescape,
current_argument_unescape, !had_ddash)) { current_argument_unescape, !had_ddash)) {
do_file = false; do_file = false;
} }
delete transient_cmd; // may be null
} }
} }