h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-30 23:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make shell highlighting a toggle instead of a function parameter

Browse Source 
Remove the ability to specify the "highlight function." The reader
always highlights via shell highlighting, or doesn't.
This commit is contained in:
ridiculousfish
2020-08-03 14:10:37 -07:00
parent 18c7c46657
commit 7304815736
9 changed files with 39 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/builtin_functions.cpp
View File

@@ -262,9 +262,8 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
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(),
operation_context_t{nullptr, env_stack_t::globals(), no_cancel});
highlight_shell(comment, colors, comment.size(),
operation_context_t{nullptr, env_stack_t::globals(), no_cancel});
streams.out.append(str2wcstring(colorize(comment, colors)));
} else {
streams.out.append(comment);
@@ -442,7 +441,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
std::vector<highlight_spec_t> colors;
highlight_shell_no_io(def, colors, def.size(), operation_context_t::globals());
highlight_shell(def, colors, def.size(), operation_context_t::globals());
streams.out.append(str2wcstring(colorize(def, colors)));
} else {
streams.out.append(def);