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

Ellipsis OCD

Browse Source
This commit is contained in:
Aaron Gyes 2019-09-19 11:09:37 -07:00
parent fda8ad429b
commit 2b7b70a64f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/builtin_set.cpp
View File

@ -571,9 +571,14 @@ static void show_scope(const wchar_t *var_name, int scope, io_streams_t &streams
wcstring_list_t vals = var->as_list();
streams.out.append_format(_(L"$%ls: set in %ls scope, %ls, with %d elements\n"), var_name,
scope_name, exportv, vals.size());
for (size_t i = 0; i < vals.size(); i++) {
if (vals.size() > 100) {
if (i == 50) streams.out.append(L"...\n");
if (i == 50) {
// try to print a mid-line ellipsis because we are eliding lines not words
streams.out.append(get_ellipsis_char() > 256 ? L"\u22EF" : get_ellipsis_str());
streams.out.push_back(L'\n');
}
if (i >= 50 && i < vals.size() - 50) continue;
}
const wcstring value = vals[i];

4
src/parse_util.cpp
View File

@ -882,7 +882,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
// Make sure we always show something.
if (token_after_parens.empty()) {
token_after_parens = L"...";
token_after_parens = get_ellipsis_str();
}
append_syntax_error(errors, global_dollar_pos, ERROR_BAD_VAR_SUBCOMMAND1,
@ -935,7 +935,7 @@ static parser_test_error_bits_t detect_dollar_cmdsub_errors(size_t arg_src_offse
wcstring subcommand_first_token = tok_first(cmdsubst_src);
if (subcommand_first_token.empty()) {
// e.g. $(). Report somthing.
subcommand_first_token = L"...";
subcommand_first_token = get_ellipsis_str();
}
append_syntax_error(
out_errors,