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

clang-format .cpp files

Browse Source
This commit is contained in:
ridiculousfish 2019-11-29 23:57:19 -08:00
parent e4a7e7d4f7
commit fb8e90de28
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/complete.cpp
View File

@ -1589,16 +1589,19 @@ void completer_t::perform() {
tokenizer_t tok(unaliased_cmd.c_str(), TOK_ACCEPT_UNFINISHED);
maybe_t<tok_t> cmd_tok = tok.next();
assert(cmd_tok);
unaliased_cmd = unaliased_cmd.replace(0, cmd_tok->offset + cmd_tok->length, L"");
unaliased_cmd =
unaliased_cmd.replace(0, cmd_tok->offset + cmd_tok->length, L"");
parser->libdata().transient_commandlines.push_back(unaliased_cmd);
cleanup_t remove_transient([&] { parser->libdata().transient_commandlines.pop_back(); });
cleanup_t remove_transient(
[&] { parser->libdata().transient_commandlines.pop_back(); });
std::vector<completion_t> comp;
complete(unaliased_cmd, &comp,
completion_request_t::fuzzy_match, parser->vars(), parser->shared());
complete(unaliased_cmd, &comp, completion_request_t::fuzzy_match,
parser->vars(), parser->shared());
this->completions.insert(completions.end(), comp.begin(), comp.end());
do_file = false;
} else if (!complete_param(cmd, previous_argument_unescape, current_argument_unescape,
!had_ddash)) { // Invoke any custom completions for this command.
} else if (!complete_param(
cmd, previous_argument_unescape, current_argument_unescape,
!had_ddash)) { // Invoke any custom completions for this command.
do_file = false;
}
if (wants_transient) {

4
src/fallback.cpp
View File

@ -219,9 +219,7 @@ int futimes(int fd, const struct timeval *times) {
#endif
#if HAVE_GETTEXT
char *fish_gettext(const char *msgid) {
return gettext(msgid);
}
char *fish_gettext(const char *msgid) { return gettext(msgid); }
char *fish_bindtextdomain(const char *domainname, const char *dirname) {
return bindtextdomain(domainname, dirname);