Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 20:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

functions: Replace crummy forced tab with spaces

Browse source 
Still forced indentation, but at least the kind we recommend via
fish_indent.

Fixes #1472.
This commit is contained in:
Fabian Homborg 2019-05-04 19:16:02 +02:00
parent df7cb66ff9
commit 90d64194c5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/builtin_functions.cpp
View file

@ -204,8 +204,9 @@ static wcstring functions_def(const wcstring &name) {
wcstring_list_t lst; wcstring_list_t lst;
kv.second.to_list(lst); kv.second.to_list(lst);
// This forced tab is crummy, but we don't know what indentation style the function uses. // We don't know what indentation style the function uses,
append_format(out, L"\n\tset -l %ls", kv.first.c_str()); // so we do what fish_indent would.
append_format(out, L"\n set -l %ls", kv.first.c_str());
for (const auto &arg : lst) { for (const auto &arg : lst) {
wcstring earg = escape_string(arg, ESCAPE_ALL); wcstring earg = escape_string(arg, ESCAPE_ALL);
out.push_back(L' '); out.push_back(L' ');
@ -213,8 +214,8 @@ static wcstring functions_def(const wcstring &name) {
} }
} }
// This forced tab is sort of crummy - not all functions start with a tab. // More forced indentation.
append_format(out, L"\n\t%ls", def.c_str()); append_format(out, L"\n %ls", def.c_str());
// Append a newline before the 'end', unless there already is one there. // Append a newline before the 'end', unless there already is one there.
if (!string_suffixes_string(L"\n", def)) { if (!string_suffixes_string(L"\n", def)) {