Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-31 23:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Swap file size and file type description position in pager"

Browse source 
This reverts commit d8722a3ddf.

I underestimated the value of having the file sizes easier to
eyeball and compair. Back to the drawing board.
This commit is contained in:
Aaron Gyes 2021-10-23 22:17:09 -07:00
parent d8722a3ddf
commit a7e62a538e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wildcard.cpp
View file

@ -38,7 +38,7 @@
/// Description for block device. /// Description for block device.
#define COMPLETE_BLOCK_DESC _(L"Block device") #define COMPLETE_BLOCK_DESC _(L"Block device")
/// Description for fifo buffer. /// Description for fifo buffer.
#define COMPLETE_FIFO_DESC _(L"fifo") #define COMPLETE_FIFO_DESC _(L"Fifo")
/// Description for symlink. /// Description for symlink.
#define COMPLETE_SYMLINK_DESC _(L"Symbolic link") #define COMPLETE_SYMLINK_DESC _(L"Symbolic link")
/// Description for symlink. /// Description for symlink.
@ -509,14 +509,14 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
// Compute the description. // Compute the description.
wcstring desc; wcstring desc;
if (expand_flags & expand_flag::gen_descriptions) { if (expand_flags & expand_flag::gen_descriptions) {
if (file_size >= 0) desc = file_get_desc(lstat_res, lstat_buf, stat_res, stat_buf, stat_errno);
desc = format_size(file_size);
if (!desc.empty()) { if (file_size >= 0) {
desc.append(L", "); if (!desc.empty()) desc.append(L", ");
desc.append(file_get_desc(lstat_res, lstat_buf, stat_res, stat_buf, stat_errno)); desc.append(format_size(file_size));
} }
} }
// Append a / if this is a directory. Note this requirement may be the only reason we have to // Append a / if this is a directory. Note this requirement may be the only reason we have to
// call stat() in some cases. // call stat() in some cases.
auto desc_func = const_desc(desc); auto desc_func = const_desc(desc);