Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 23:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

builtin functions: colorize output if interactive

Browse source 
We can also get rid of the | fish_indent --ansi stuff in type.fish
This commit is contained in:
Aaron Gyes 2019-09-25 04:03:47 -07:00
parent 8063d6d0b8
commit 19c575e116
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
share/functions/type.fish
View file

@ -49,11 +49,7 @@ function type --description 'Print the type of a command'
switch $mode
case normal
printf (_ '%s is a function with definition\n') $i
if isatty stdout
functions $i | fish_indent --ansi
else
functions $i | fish_indent
end
functions $i
case type
echo (_ 'function')
case path

21
src/builtin_functions.cpp
View file

@ -20,6 +20,7 @@
#include "event.h"
#include "fallback.h" // IWYU pragma: keep
#include "function.h"
#include "highlight.h"
#include "io.h"
#include "parser_keywords.h"
#include "proc.h"
@ -261,7 +262,15 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
if (metadata_as_comments) {
if (std::wcscmp(path, L"stdin")) {
streams.out.append_format(L"# Defined in %ls @ line %d\n", path, line_number);
wcstring comment;
append_format(comment, L"# Defined in %ls @ line %d\n", path, line_number);
if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
std::vector<highlight_spec_t> colors;
highlight_shell_no_io(comment, colors, comment.size(), nullptr, env_stack_t::globals());
streams.out.append(str2wcstring(colorize(comment, colors)));
} else {
streams.out.append(comment);
}
}
} else {
streams.out.append_format(L"%ls\n", path);
@ -426,7 +435,15 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (i != optind) streams.out.append(L"\n");
const wchar_t *funcname = argv[optind];
report_function_metadata(funcname, opts.verbose, streams, parser, true);
streams.out.append(functions_def(funcname));
wcstring def = functions_def(funcname);
if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
std::vector<highlight_spec_t> colors;
highlight_shell_no_io(def, colors, def.size(), nullptr, env_stack_t::globals());
streams.out.append(str2wcstring(colorize(def, colors)));
} else {
streams.out.append(def);
}
}
}
}