diff options
| author |  Kurtis Rader <krader@skepticism.us> | 2016-05-03 10:36:22 -0700 |
|---|---|---|
| committer | Kurtis Rader <krader@skepticism.us> | 2016-05-03 12:14:41 -0700 |
| commit | 835176ef324b049d5195a0276b8d7eb1b3b85c47 (patch) | |
| tree | 380982e49b60f1a0209bdbbfdf9139bdfdf949a9 /src | |
| parent | ed086fb1c88956da8046a0834aaedadeb3a7064c (diff) | |
restyle reader module to match project style
Reduces lint errors from 338 to 205 (-39%). Line count from 4650 to 3654 (-21%).
Another step in resolving issue #2902.
Diffstat (limited to 'src')
| -rw-r--r-- | src/reader.cpp | 3709 | ||||
| -rw-r--r-- | src/reader.h | 325 |
2 files changed, 1519 insertions, 2515 deletions
diff --git a/src/reader.cpp b/src/reader.cpp index fb7cc5f2..7b623488 100644 --- a/src/reader.cpp +++ b/src/reader.cpp @@ -1,171 +1,139 @@ -/** \file reader.c - -Functions for reading data from stdin and passing to the -parser. If stdin is a keyboard, it supplies a killring, history, -syntax highlighting, tab-completion and various other interactive features. - -Internally the interactive mode functions rely in the functions of the -input library to read individual characters of input. - -Token search is handled incrementally. Actual searches are only done -on when searching backwards, since the previous results are saved. The -last search position is remembered and a new search continues from the -last search position. All search results are saved in the list -'search_prev'. When the user searches forward, i.e. presses Alt-down, -the list is consulted for previous search result, and subsequent -backwards searches are also handled by consulting the list up until -the end of the list is reached, at which point regular searching will -commence. - -*/ +// Functions for reading data from stdin and passing to the parser. If stdin is a keyboard, it +// supplies a killring, history, syntax highlighting, tab-completion and various other interactive +// features. +// +// Internally the interactive mode functions rely in the functions of the input library to read +// individual characters of input. +// +// Token search is handled incrementally. Actual searches are only done on when searching backwards, +// since the previous results are saved. The last search position is remembered and a new search +// continues from the last search position. All search results are saved in the list 'search_prev'. +// When the user searches forward, i.e. presses Alt-down, the list is consulted for previous search +// result, and subsequent backwards searches are also handled by consulting the list up until the +// end of the list is reached, at which point regular searching will commence. #include "config.h" // IWYU pragma: no_include <type_traits> -#include <algorithm> -#include <stdlib.h> +#include <errno.h> +#include <pthread.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <errno.h> +#include <sys/time.h> #include <termios.h> #include <time.h> -#include <sys/time.h> #include <unistd.h> #include <wctype.h> +#include <algorithm> #include <stack> -#include <pthread.h> #ifdef HAVE_SIGINFO_H #include <siginfo.h> #endif #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif -#include <signal.h> -#include <fcntl.h> -#include <wchar.h> #include <assert.h> +#include <fcntl.h> +#include <signal.h> #include <sys/types.h> +#include <wchar.h> #include <memory> -#include "fallback.h" // IWYU pragma: keep -#include "util.h" -#include "wutil.h" // IWYU pragma: keep -#include "highlight.h" -#include "reader.h" -#include "proc.h" -#include "parser.h" -#include "complete.h" -#include "history.h" +#include "color.h" #include "common.h" -#include "sanity.h" +#include "complete.h" #include "env.h" +#include "event.h" #include "exec.h" #include "expand.h" -#include "tokenizer.h" -#include "kill.h" -#include "input_common.h" -#include "input.h" +#include "fallback.h" // IWYU pragma: keep #include "function.h" -#include "output.h" -#include "signal.h" -#include "screen.h" -#include "iothread.h" +#include "highlight.h" +#include "history.h" +#include "input.h" +#include "input_common.h" #include "intern.h" -#include "parse_util.h" -#include "parse_tree.h" -#include "pager.h" -#include "color.h" -#include "event.h" #include "io.h" +#include "iothread.h" +#include "kill.h" +#include "output.h" +#include "pager.h" #include "parse_constants.h" +#include "parse_tree.h" +#include "parse_util.h" +#include "parser.h" +#include "proc.h" +#include "reader.h" +#include "sanity.h" +#include "screen.h" +#include "signal.h" +#include "tokenizer.h" +#include "util.h" +#include "wutil.h" // IWYU pragma: keep -/** - Maximum length of prefix string when printing completion - list. Longer prefixes will be ellipsized. -*/ +/// Maximum length of prefix string when printing completion list. Longer prefixes will be +/// ellipsized. #define PREFIX_MAX_LEN 9 -/** - A simple prompt for reading shell commands that does not rely on - fish specific commands, meaning it will work even if fish is not - installed. This is used by read_i. -*/ +/// A simple prompt for reading shell commands that does not rely on fish specific commands, meaning +/// it will work even if fish is not installed. This is used by read_i. #define DEFAULT_PROMPT L"echo -n \"$USER@\"(hostname|cut -d . -f 1)' '(__fish_pwd)'> '" -/** - The name of the function that prints the fish prompt - */ +/// The name of the function that prints the fish prompt. #define LEFT_PROMPT_FUNCTION_NAME L"fish_prompt" -/** - The name of the function that prints the fish right prompt (RPROMPT) - */ +/// The name of the function that prints the fish right prompt (RPROMPT). #define RIGHT_PROMPT_FUNCTION_NAME L"fish_right_prompt" - -/* The name of the function for getting the input mode indicator */ +/// The name of the function for getting the input mode indicator. #define MODE_PROMPT_FUNCTION_NAME L"fish_mode_prompt" - -/** - The default title for the reader. This is used by reader_readline. -*/ +/// The default title for the reader. This is used by reader_readline. #define DEFAULT_TITLE L"echo $_ \" \"; __fish_pwd" -/** - The maximum number of characters to read from the keyboard without - repainting. Note that this readahead will only occur if new - characters are available for reading, fish will never block for - more input without repainting. -*/ +/// The maximum number of characters to read from the keyboard without repainting. Note that this +/// readahead will only occur if new characters are available for reading, fish will never block for +/// more input without repainting. #define READAHEAD_MAX 256 -/** - A mode for calling the reader_kill function. In this mode, the new - string is appended to the current contents of the kill buffer. - */ +/// A mode for calling the reader_kill function. In this mode, the new string is appended to the +/// current contents of the kill buffer. #define KILL_APPEND 0 -/** - A mode for calling the reader_kill function. In this mode, the new - string is prepended to the current contents of the kill buffer. - */ + +/// A mode for calling the reader_kill function. In this mode, the new string is prepended to the +/// current contents of the kill buffer. #define KILL_PREPEND 1 -/** - History search mode. This value means that no search is currently - performed. - */ +/// History search mode. This value means that no search is currently performed. #define NO_SEARCH 0 -/** - History search mode. This value means that we are performing a line - history search. - */ + +/// History search mode. This value means that we are performing a line history search. #define LINE_SEARCH 1 -/** - History search mode. This value means that we are performing a token - history search. - */ + +/// History search mode. This value means that we are performing a token history search. #define TOKEN_SEARCH 2 -/** - History search mode. This value means we are searching backwards. - */ +/// History search mode. This value means we are searching backwards. #define SEARCH_BACKWARD 0 -/** - History search mode. This value means we are searching forwards. - */ + +/// History search mode. This value means we are searching forwards. #define SEARCH_FORWARD 1 -/* Any time the contents of a buffer changes, we update the generation count. This allows for our background highlighting thread to notice it and skip doing work that it would otherwise have to do. This variable should really be of some kind of interlocked or atomic type that guarantees we're not reading stale cache values. With C++11 we should use atomics, but until then volatile should work as well, at least on x86.*/ +/// Any time the contents of a buffer changes, we update the generation count. This allows for our +/// background highlighting thread to notice it and skip doing work that it would otherwise have to +/// do. This variable should really be of some kind of interlocked or atomic type that guarantees +/// we're not reading stale cache values. With C++11 we should use atomics, but until then volatile +/// should work as well, at least on x86. static volatile unsigned int s_generation_count; -/* This pthreads generation count is set when an autosuggestion background thread starts up, so it can easily check if the work it is doing is no longer useful. */ +/// This pthreads generation count is set when an autosuggestion background thread starts up, so it +/// can easily check if the work it is doing is no longer useful. static pthread_key_t generation_count_key; static void set_command_line_and_position(editable_line_t *el, const wcstring &new_str, size_t pos); -void editable_line_t::insert_string(const wcstring &str, size_t start, size_t len) -{ - // Clamp the range to something valid +void editable_line_t::insert_string(const wcstring &str, size_t start, size_t len) { + // Clamp the range to something valid. size_t string_length = str.size(); start = mini(start, string_length); len = mini(len, string_length - start); @@ -173,418 +141,279 @@ void editable_line_t::insert_string(const wcstring &str, size_t start, size_t le this->position += len; } -/** - A struct describing the state of the interactive reader. These - states can be stacked, in case reader_readline() calls are - nested. This happens when the 'read' builtin is used. -*/ -class reader_data_t -{ -public: - - /** String containing the whole current commandline */ +/// A struct describing the state of the interactive reader. These states can be stacked, in case +/// reader_readline() calls are nested. This happens when the 'read' builtin is used. +class reader_data_t { + public: + /// String containing the whole current commandline. editable_line_t command_line; - - /** String containing the autosuggestion */ + /// String containing the autosuggestion. wcstring autosuggestion; - - /** Current pager */ + /// Current pager. pager_t pager; - - /** Current page rendering */ + /// Current page rendering. page_rendering_t current_page_rendering; - - /** Whether autosuggesting is allowed at all */ + /// Whether autosuggesting is allowed at all. bool allow_autosuggestion; - - /** When backspacing, we temporarily suppress autosuggestions */ + /// When backspacing, we temporarily suppress autosuggestions. bool suppress_autosuggestion; - - /** Whether abbreviations are expanded */ + /// Whether abbreviations are expanded. bool expand_abbreviations; - - /** The representation of the current screen contents */ + /// The representation of the current screen contents. screen_t screen; - - /** The history */ + /// The history. history_t *history; - - /** - String containing the current search item - */ + /// String containing the current search item. wcstring search_buff; - - /* History search */ + /// History search. history_search_t history_search; - - /** - Saved position used by token history search - */ + /// Saved position used by token history search. size_t token_history_pos; - - /** - Saved search string for token history search. Not handled by command_line_changed. - */ + /// Saved search string for token history search. Not handled by command_line_changed. wcstring token_history_buff; - - /** - List for storing previous search results. Used to avoid duplicates. - */ + /// List for storing previous search results. Used to avoid duplicates. wcstring_list_t search_prev; - - /** The current position in search_prev */ + /// The current position in search_prev. size_t search_pos; - - bool is_navigating_pager_contents() const - { - return this->pager.is_navigating_contents(); - } - - /* The line that is currently being edited. Typically the command line, but may be the search field */ - editable_line_t *active_edit_line() - { - if (this->is_navigating_pager_contents() && this->pager.is_search_field_shown()) - { - return &this->pager.search_field_line; - } - else - { - return &this->command_line; - } - } - - /** Do what we need to do whenever our command line changes */ - void command_line_changed(const editable_line_t *el); - - /** Do what we need to do whenever our pager selection */ - void pager_selection_changed(); - - /** Expand abbreviations at the current cursor position, minus backtrack_amt. */ - bool expand_abbreviation_as_necessary(size_t cursor_backtrack); - - /** Indicates whether a selection is currently active */ + /// Indicates whether a selection is currently active. bool sel_active; - - /** The position of the cursor, when selection was initiated. */ + /// The position of the cursor, when selection was initiated. size_t sel_begin_pos; - - /** The start position of the current selection, if one. */ + /// The start position of the current selection, if one. size_t sel_start_pos; - - /** The stop position of the current selection, if one. */ + /// The stop position of the current selection, if one. size_t sel_stop_pos; - - /** Name of the current application */ + /// Name of the current application. wcstring app_name; - - /** The prompt commands */ + /// The prompt commands. wcstring left_prompt; wcstring right_prompt; - - /** The output of the last evaluation of the prompt command */ + /// The output of the last evaluation of the prompt command. wcstring left_prompt_buff; - - /** The output of the last evaluation of the right prompt command */ + /// The output of the last evaluation of the right prompt command. wcstring right_prompt_buff; - - /* Completion support */ + /// Completion support. wcstring cycle_command_line; size_t cycle_cursor_pos; - - /** - Color is the syntax highlighting for buff. The format is that - color[i] is the classification (according to the enum in - highlight.h) of buff[i]. - */ + /// Color is the syntax highlighting for buff. The format is that color[i] is the + /// classification (according to the enum in highlight.h) of buff[i]. std::vector<highlight_spec_t> colors; - - /** An array defining the block level at each character. */ + /// An array defining the block level at each character. std::vector<int> indents; - - /** - Function for tab completion - */ + /// Function for tab completion. complete_function_t complete_func; - - /** - Function for syntax highlighting - */ + /// Function for syntax highlighting. highlight_function_t highlight_function; - - /** - Function for testing if the string can be returned - */ + /// Function for testing if the string can be returned. parser_test_error_bits_t (*test_func)(const wchar_t *); - - /** - When this is true, the reader will exit - */ + /// When this is true, the reader will exit. bool end_loop; - - /** - If this is true, exit reader even if there are running - jobs. This happens if we press e.g. ^D twice. - */ + /// If this is true, exit reader even if there are running jobs. This happens if we press e.g. + /// ^D twice. bool prev_end_loop; - - /** The current contents of the top item in the kill ring. */ + /// The current contents of the top item in the kill ring. wcstring kill_item; - - /** - Pointer to previous reader_data - */ + /// Pointer to previous reader_data. reader_data_t *next; - - /** - This variable keeps state on if we are in search mode, and - if yes, what mode - */ + /// This variable keeps state on if we are in search mode, and if yes, what mode. int search_mode; - - /** - Keep track of whether any internal code has done something - which is known to require a repaint. - */ + /// Keep track of whether any internal code has done something which is known to require a + /// repaint. bool repaint_needed; - - /** Whether a screen reset is needed after a repaint. */ + /// Whether a screen reset is needed after a repaint. bool screen_reset_needed; - - /** Whether the reader should exit on ^C. */ + /// Whether the reader should exit on ^C. bool exit_on_interrupt; - /** Constructor */ - reader_data_t() : - allow_autosuggestion(0), - suppress_autosuggestion(0), - expand_abbreviations(0), - history(0), - token_history_pos(0), - search_pos(0), - sel_active(0), - sel_begin_pos(0), - sel_start_pos(0), - sel_stop_pos(0), - cycle_cursor_pos(0), - complete_func(0), - highlight_function(0), - test_func(0), - end_loop(0), - prev_end_loop(0), - next(0), - search_mode(0), - repaint_needed(0), - screen_reset_needed(0), - exit_on_interrupt(0) - { + bool is_navigating_pager_contents() const { return this->pager.is_navigating_contents(); } + + /// The line that is currently being edited. Typically the command line, but may be the search + /// field. + editable_line_t *active_edit_line() { + if (this->is_navigating_pager_contents() && this->pager.is_search_field_shown()) { + return &this->pager.search_field_line; + } else { + return &this->command_line; + } } + + /// Do what we need to do whenever our command line changes. + void command_line_changed(const editable_line_t *el); + + /// Do what we need to do whenever our pager selection. + void pager_selection_changed(); + + /// Expand abbreviations at the current cursor position, minus backtrack_amt. + bool expand_abbreviation_as_necessary(size_t cursor_backtrack); + + /// Constructor + reader_data_t() + : allow_autosuggestion(0), + suppress_autosuggestion(0), + expand_abbreviations(0), + history(0), + token_history_pos(0), + search_pos(0), + sel_active(0), + sel_begin_pos(0), + sel_start_pos(0), + sel_stop_pos(0), + cycle_cursor_pos(0), + complete_func(0), + highlight_function(0), + test_func(0), + end_loop(0), + prev_end_loop(0), + next(0), + search_mode(0), + repaint_needed(0), + screen_reset_needed(0), + exit_on_interrupt(0) {} }; -/* Sets the command line contents, without clearing the pager */ +/// Sets the command line contents, without clearing the pager. static void reader_set_buffer_maintaining_pager(const wcstring &b, size_t pos); -/* Clears the pager */ +/// Clears the pager. static void clear_pager(); -/** - The current interactive reading context -*/ -static reader_data_t *data=0; +/// The current interactive reading context. +static reader_data_t *data = 0; -/** - This flag is set to true when fish is interactively reading from - stdin. It changes how a ^C is handled by the fish interrupt - handler. -*/ +/// This flag is set to true when fish is interactively reading from stdin. It changes how a ^C is +/// handled by the fish interrupt handler. static int is_interactive_read; -/** - Flag for ending non-interactive shell -*/ +/// Flag for ending non-interactive shell. static int end_loop = 0; -/** The stack containing names of files that are being parsed */ +/// The stack containing names of files that are being parsed. static std::stack<const wchar_t *, std::vector<const wchar_t *> > current_filename; -/** - This variable is set to true by the signal handler when ^C is pressed -*/ -static volatile int interrupted=0; - - -/* - Prototypes for a bunch of functions defined later on. -*/ +/// This variable is set to true by the signal handler when ^C is pressed. +static volatile int interrupted = 0; +// Prototypes for a bunch of functions defined later on. static bool is_backslashed(const wcstring &str, size_t pos); static wchar_t unescaped_quote(const wcstring &str, size_t pos); -/** Mode on startup, which we restore on exit */ +/// Mode on startup, which we restore on exit. static struct termios terminal_mode_on_startup; -/** Mode we use to execute programs */ +/// Mode we use to execute programs. static struct termios terminal_mode_for_executing_programs; - static void reader_super_highlight_me_plenty(int highlight_pos_adjust = 0, bool no_io = false); -/** - Variable to keep track of forced exits - see \c reader_exit_forced(); -*/ +/// Variable to keep track of forced exits - see \c reader_exit_forced(); static int exit_forced; - -/** - Give up control of terminal -*/ -static void term_donate() -{ +/// Give up control of terminal. +static void term_donate() { set_color(rgb_color_t::normal(), rgb_color_t::normal()); - while (1) - { - if (tcsetattr(0, TCSANOW, &terminal_mode_for_executing_programs)) - { - if (errno != EINTR) - { + while (1) { + if (tcsetattr(0, TCSANOW, &terminal_mode_for_executing_programs)) { + if (errno != EINTR) { debug(1, _(L"Could not set terminal mode for new job")); wperror(L"tcsetattr"); break; } - } - else + } else break; } - - } - -/** - Update the cursor position -*/ -static void update_buff_pos(editable_line_t *el, size_t buff_pos) -{ +/// Update the cursor position. +static void update_buff_pos(editable_line_t *el, size_t buff_pos) { el->position = buff_pos; - if (el == &data->command_line && data->sel_active) - { - if (data->sel_begin_pos <= buff_pos) - { + if (el == &data->command_line && data->sel_active) { + if (data->sel_begin_pos <= buff_pos) { data->sel_start_pos = data->sel_begin_pos; data->sel_stop_pos = buff_pos; - } - else - { + } else { data->sel_start_pos = buff_pos; data->sel_stop_pos = data->sel_begin_pos; } } } - -/** - Grab control of terminal -*/ -static void term_steal() -{ - - while (1) - { - if (tcsetattr(0,TCSANOW,&shell_modes)) - { - if (errno != EINTR) - { +/// Grab control of terminal. +static void term_steal() { + while (1) { + if (tcsetattr(0, TCSANOW, &shell_modes)) { + if (errno != EINTR) { debug(1, _(L"Could not set terminal mode for shell")); wperror(L"tcsetattr"); break; } - } - else + } else break; } common_handle_winch(0); - } -int reader_exit_forced() -{ - return exit_forced; -} +int reader_exit_forced() { return exit_forced; } -/* Given a command line and an autosuggestion, return the string that gets shown to the user */ -wcstring combine_command_and_autosuggestion(const wcstring &cmdline, const wcstring &autosuggestion) -{ - // We want to compute the full line, containing the command line and the autosuggestion - // They may disagree on whether characters are uppercase or lowercase - // Here we do something funny: if the last token of the command line contains any uppercase characters, we use its case - // Otherwise we use the case of the autosuggestion - // This is an idea from https://github.com/fish-shell/fish-shell/issues/335 +/// Given a command line and an autosuggestion, return the string that gets shown to the user. +wcstring combine_command_and_autosuggestion(const wcstring &cmdline, + const wcstring &autosuggestion) { + // We want to compute the full line, containing the command line and the autosuggestion They may + // disagree on whether characters are uppercase or lowercase Here we do something funny: if the + // last token of the command line contains any uppercase characters, we use its case. Otherwise + // we use the case of the autosuggestion. This is an idea from issue #335. wcstring full_line; - if (autosuggestion.size() <= cmdline.size() || cmdline.empty()) - { - // No or useless autosuggestion, or no command line + if (autosuggestion.size() <= cmdline.size() || cmdline.empty()) { + // No or useless autosuggestion, or no command line. full_line = cmdline; - } - else if (string_prefixes_string(cmdline, autosuggestion)) - { - // No case disagreements, or no extra characters in the autosuggestion + } else if (string_prefixes_string(cmdline, autosuggestion)) { + // No case disagreements, or no extra characters in the autosuggestion. full_line = autosuggestion; - } - else - { - // We have an autosuggestion which is not a prefix of the command line, i.e. a case disagreement - // Decide whose case we want to use + } else { + // We have an autosuggestion which is not a prefix of the command line, i.e. a case + // disagreement. Decide whose case we want to use. const wchar_t *begin = NULL, *cmd = cmdline.c_str(); parse_util_token_extent(cmd, cmdline.size() - 1, &begin, NULL, NULL, NULL); bool last_token_contains_uppercase = false; - if (begin) - { + if (begin) { const wchar_t *end = begin + wcslen(begin); last_token_contains_uppercase = (std::find_if(begin, end, iswupper) != end); } - if (! last_token_contains_uppercase) - { - // Use the autosuggestion's case + if (!last_token_contains_uppercase) { + // Use the autosuggestion's case. full_line = autosuggestion; - } - else - { - // Use the command line case for its characters, then append the remaining characters in the autosuggestion - // Note that we know that autosuggestion.size() > cmdline.size() due to the first test above + } else { + // Use the command line case for its characters, then append the remaining characters in + // the autosuggestion. Note that we know that autosuggestion.size() > cmdline.size() due + // to the first test above. full_line = cmdline; - full_line.append(autosuggestion, cmdline.size(), autosuggestion.size() - cmdline.size()); + full_line.append(autosuggestion, cmdline.size(), + autosuggestion.size() - cmdline.size()); } } return full_line; } -/** - Repaint the entire commandline. This means reset and clear the - commandline, write the prompt, perform syntax highlighting, write - the commandline and move the cursor. -*/ -static void reader_repaint() -{ +/// Repaint the entire commandline. This means reset and clear the commandline, write the prompt, +/// perform syntax highlighting, write the commandline and move the cursor. +static void reader_repaint() { editable_line_t *cmd_line = &data->command_line; - // Update the indentation + // Update the indentation. data->indents = parse_util_compute_indents(cmd_line->text); - // Combine the command and autosuggestion into one string + // Combine the command and autosuggestion into one string. wcstring full_line = combine_command_and_autosuggestion(cmd_line->text, data->autosuggestion); size_t len = full_line.size(); - if (len < 1) - len = 1; + if (len < 1) len = 1; std::vector<highlight_spec_t> colors = data->colors; colors.resize(len, highlight_spec_autosuggestion); - if (data->sel_active) - { + if (data->sel_active) { highlight_spec_t selection_color = highlight_make_background(highlight_spec_selection); - for (size_t i = data->sel_start_pos; i <= std::min(len - 1, data->sel_stop_pos); i++) - { + for (size_t i = data->sel_start_pos; i <= std::min(len - 1, data->sel_stop_pos); i++) { colors[i] = selection_color; } } @@ -592,59 +421,42 @@ static void reader_repaint() std::vector<int> indents = data->indents; indents.resize(len); - // Re-render our completions page if necessary - // We set the term size to 1 less than the true term height. This means we will always show the (bottom) line of the prompt. + // Re-render our completions page if necessary. We set the term size to 1 less than the true + // term height. This means we will always show the (bottom) line of the prompt. data->pager.set_term_size(maxi(1, common_get_width()), maxi(1, common_get_height() - 1)); data->pager.update_rendering(&data->current_page_rendering); bool focused_on_pager = data->active_edit_line() == &data->pager.search_field_line; size_t cursor_position = focused_on_pager ? data->pager.cursor_position() : cmd_line->position; - s_write(&data->screen, - data->left_prompt_buff, - data->right_prompt_buff, - full_line, - cmd_line->size(), - &colors[0], - &indents[0], - cursor_position, - data->sel_start_pos, - data->sel_stop_pos, - data->current_page_rendering, - focused_on_pager); + s_write(&data->screen, data->left_prompt_buff, data->right_prompt_buff, full_line, + cmd_line->size(), &colors[0], &indents[0], cursor_position, data->sel_start_pos, + data->sel_stop_pos, data->current_page_rendering, focused_on_pager); data->repaint_needed = false; } -/** Internal helper function for handling killing parts of text. */ -static void reader_kill(editable_line_t *el, size_t begin_idx, size_t length, int mode, int newv) -{ +/// Internal helper function for handling killing parts of text. +static void reader_kill(editable_line_t *el, size_t begin_idx, size_t length, int mode, int newv) { const wchar_t *begin = el->text.c_str() + begin_idx; - if (newv) - { + if (newv) { data->kill_item = wcstring(begin, length); kill_add(data->kill_item); - } - else - { + } else { wcstring old = data->kill_item; - if (mode == KILL_APPEND) - { + if (mode == KILL_APPEND) { data->kill_item.append(begin, length); - } - else - { + } else { data->kill_item = wcstring(begin, length); data->kill_item.append(old); } - kill_replace(old, data->kill_item); } - if (el->position > begin_idx) - { - /* Move the buff position back by the number of characters we deleted, but don't go past buff_pos */ + if (el->position > begin_idx) { + // Move the buff position back by the number of characters we deleted, but don't go past + // buff_pos. size_t backtrack = mini(el->position - begin_idx, length); update_buff_pos(el, el->position - backtrack); } @@ -656,154 +468,138 @@ static void reader_kill(editable_line_t *el, size_t begin_idx, size_t length, in reader_repaint(); } - -/* This is called from a signal handler! */ -void reader_handle_int(int sig) -{ - if (!is_interactive_read) - { +// This is called from a signal handler! +void reader_handle_int(int sig) { + if (!is_interactive_read) { parser_t::skip_all_blocks(); } interrupted = 1; - } -const wchar_t *reader_current_filename() -{ +const wchar_t *reader_current_filename() { ASSERT_IS_MAIN_THREAD(); return current_filename.empty() ? NULL : current_filename.top(); } - -void reader_push_current_filename(const wchar_t *fn) -{ +void reader_push_current_filename(const wchar_t *fn) { ASSERT_IS_MAIN_THREAD(); current_filename.push(intern(fn)); } - -void reader_pop_current_filename() -{ +void reader_pop_current_filename() { ASSERT_IS_MAIN_THREAD(); current_filename.pop(); } - -/** Make sure buffers are large enough to hold the current string length */ -void reader_data_t::command_line_changed(const editable_line_t *el) -{ +/// Make sure buffers are large enough to hold the current string length. +void reader_data_t::command_line_changed(const editable_line_t *el) { ASSERT_IS_MAIN_THREAD(); - if (el == &this->command_line) - { + if (el == &this->command_line) { size_t len = this->command_line.size(); - /* When we grow colors, propagate the last color (if any), under the assumption that usually it will be correct. If it is, it avoids a repaint. */ + // When we grow colors, propagate the last color (if any), under the assumption that usually + // it will be correct. If it is, it avoids a repaint. highlight_spec_t last_color = colors.empty() ? highlight_spec_t() : colors.back(); colors.resize(len, last_color); indents.resize(len); - /* Update the gen count */ + // Update the gen count. s_generation_count++; - } - else if (el == &this->pager.search_field_line) - { + } else if (el == &this->pager.search_field_line) { this->pager.refilter_completions(); this->pager_selection_changed(); } } -void reader_data_t::pager_selection_changed() -{ +void reader_data_t::pager_selection_changed() { ASSERT_IS_MAIN_THREAD(); const completion_t *completion = this->pager.selected_completion(this->current_page_rendering); - /* Update the cursor and command line */ + // Update the cursor and command line. size_t cursor_pos = this->cycle_cursor_pos; wcstring new_cmd_line; - if (completion == NULL) - { + if (completion == NULL) { new_cmd_line = this->cycle_command_line; - } - else - { - new_cmd_line = completion_apply_to_command_line(completion->completion, completion->flags, this->cycle_command_line, &cursor_pos, false); + } else { + new_cmd_line = + completion_apply_to_command_line(completion->completion, completion->flags, + this->cycle_command_line, &cursor_pos, false); } reader_set_buffer_maintaining_pager(new_cmd_line, cursor_pos); - /* Since we just inserted a completion, don't immediately do a new autosuggestion */ + // Since we just inserted a completion, don't immediately do a new autosuggestion. this->suppress_autosuggestion = true; - /* Trigger repaint (see #765) */ + // Trigger repaint (see issue #765). reader_repaint_needed(); } -/* Expand abbreviations at the given cursor position. Does NOT inspect 'data'. */ -bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos, wcstring *output) -{ - /* See if we are at "command position". Get the surrounding command substitution, and get the extent of the first token. */ - const wchar_t * const buff = cmdline.c_str(); +/// Expand abbreviations at the given cursor position. Does NOT inspect 'data'. +bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos, + wcstring *output) { + // See if we are at "command position". Get the surrounding command substitution, and get the + // extent of the first token. + const wchar_t *const buff = cmdline.c_str(); const wchar_t *cmdsub_begin = NULL, *cmdsub_end = NULL; parse_util_cmdsubst_extent(buff, cursor_pos, &cmdsub_begin, &cmdsub_end); assert(cmdsub_begin != NULL && cmdsub_begin >= buff); assert(cmdsub_end != NULL && cmdsub_end >= cmdsub_begin); - /* Determine the offset of this command substitution */ + // Determine the offset of this command substitution. const size_t subcmd_offset = cmdsub_begin - buff; const wcstring subcmd = wcstring(cmdsub_begin, cmdsub_end - cmdsub_begin); const size_t subcmd_cursor_pos = cursor_pos - subcmd_offset; - /* Parse this subcmd */ + // Parse this subcmd. parse_node_tree_t parse_tree; - parse_tree_from_string(subcmd, parse_flag_continue_after_error | parse_flag_accept_incomplete_tokens, &parse_tree, NULL); + parse_tree_from_string(subcmd, + parse_flag_continue_after_error | parse_flag_accept_incomplete_tokens, + &parse_tree, NULL); - /* Look for plain statements where the cursor is at the end of the command */ + // Look for plain statements where the cursor is at the end of the command. const parse_node_t *matching_cmd_node = NULL; const size_t len = parse_tree.size(); - for (size_t i=0; i < len; i++) - { + for (size_t i = 0; i < len; i++) { const parse_node_t &node = parse_tree.at(i); - /* Only interested in plain statements with source */ - if (node.type != symbol_plain_statement || ! node.has_source()) - continue; + // Only interested in plain statements with source. + if (node.type != symbol_plain_statement || !node.has_source()) continue; - /* Skip decorated statements */ + // Skip decorated statements. if (parse_tree.decoration_for_plain_statement(node) != parse_statement_decoration_none) continue; - /* Get the command node. Skip it if we can't or it has no source */ + // Get the command node. Skip it if we can't or it has no source. const parse_node_t *cmd_node = parse_tree.get_child(node, 0, parse_token_type_string); - if (cmd_node == NULL || ! cmd_node->has_source()) - continue; + if (cmd_node == NULL || !cmd_node->has_source()) continue; - /* Now see if its source range contains our cursor, including at the end */ - if (subcmd_cursor_pos >= cmd_node->source_start && subcmd_cursor_pos <= cmd_node->source_start + cmd_node->source_length) - { - /* Success! */ + // Now see if its source range contains our cursor, including at the end. + if (subcmd_cursor_pos >= cmd_node->source_start && + subcmd_cursor_pos <= cmd_node->source_start + cmd_node->source_length) { + // Success! matching_cmd_node = cmd_node; break; } } - /* Now if we found a command node, expand it */ + // Now if we found a command node, expand it. bool result = false; - if (matching_cmd_node != NULL) - { + if (matching_cmd_node != NULL) { assert(matching_cmd_node->type == parse_token_type_string); const wcstring token = matching_cmd_node->get_source(subcmd); wcstring abbreviation; - if (expand_abbreviation(token, &abbreviation)) - { - /* There was an abbreviation! Replace the token in the full command. Maintain the relative position of the cursor. */ - if (output != NULL) - { + if (expand_abbreviation(token, &abbreviation)) { + // There was an abbreviation! Replace the token in the full command. Maintain the + // relative position of the cursor. + if (output != NULL) { output->assign(cmdline); - output->replace(subcmd_offset + matching_cmd_node->source_start, matching_cmd_node->source_length, abbreviation); + output->replace(subcmd_offset + matching_cmd_node->source_start, + matching_cmd_node->source_length, abbreviation); } result = true; } @@ -811,22 +607,21 @@ bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t curso return result; } -/* Expand abbreviations at the current cursor position, minus the given cursor backtrack. This may change the command line but does NOT repaint it. This is to allow the caller to coalesce repaints. */ -bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) -{ +/// Expand abbreviations at the current cursor position, minus the given cursor backtrack. This may +/// change the command line but does NOT repaint it. This is to allow the caller to coalesce +/// repaints. +bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) { bool result = false; editable_line_t *el = data->active_edit_line(); - if (this->expand_abbreviations && el == &data->command_line) - { - /* Try expanding abbreviations */ + if (this->expand_abbreviations && el == &data->command_line) { + // Try expanding abbreviations. wcstring new_cmdline; size_t cursor_pos = el->position - mini(el->position, cursor_backtrack); - if (reader_expand_abbreviation_in_command(el->text, cursor_pos, &new_cmdline)) - { - /* We expanded an abbreviation! The cursor moves by the difference in the command line lengths. */ + if (reader_expand_abbreviation_in_command(el->text, cursor_pos, &new_cmdline)) { + // We expanded an abbreviation! The cursor moves by the difference in the command line + // lengths. size_t new_buff_pos = el->position + new_cmdline.size() - el->text.size(); - el->text.swap(new_cmdline); update_buff_pos(el, new_buff_pos); data->command_line_changed(el); @@ -836,90 +631,68 @@ bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) return result; } -void reader_reset_interrupted() -{ - interrupted = 0; -} +void reader_reset_interrupted() { interrupted = 0; } -int reader_interrupted() -{ +int reader_interrupted() { int res = interrupted; - if (res) - { - interrupted=0; + if (res) { + interrupted = 0; } return res; } -int reader_reading_interrupted() -{ +int reader_reading_interrupted() { int res = reader_interrupted(); - if (res && data && data->exit_on_interrupt) - { + if (res && data && data->exit_on_interrupt) { reader_exit(1, 0); parser_t::skip_all_blocks(); - // We handled the interrupt ourselves, our caller doesn't need to - // handle it. + // We handled the interrupt ourselves, our caller doesn't need to handle it. return 0; } return res; } -bool reader_thread_job_is_stale() -{ +bool reader_thread_job_is_stale() { ASSERT_IS_BACKGROUND_THREAD(); - return (void*)(uintptr_t) s_generation_count != pthread_getspecific(generation_count_key); + return (void *)(uintptr_t)s_generation_count != pthread_getspecific(generation_count_key); } -void reader_write_title(const wcstring &cmd, bool reset_cursor_position) -{ +void reader_write_title(const wcstring &cmd, bool reset_cursor_position) { const env_var_t term_str = env_get_string(L"TERM"); - /* - This is a pretty lame heuristic for detecting terminals that do - not support setting the title. If we recognise the terminal name - as that of a virtual terminal, we assume it supports setting the - title. If we recognise it as that of a console, we assume it - does not support setting the title. Otherwise we check the - ttyname and see if we believe it is a virtual terminal. - - One situation in which this breaks down is with screen, since - screen supports setting the terminal title if the underlying - terminal does so, but will print garbage on terminals that - don't. Since we can't see the underlying terminal below screen - there is no way to fix this. - */ - if (term_str.missing()) - return; + // This is a pretty lame heuristic for detecting terminals that do not support setting the + // title. If we recognise the terminal name as that of a virtual terminal, we assume it supports + // setting the title. If we recognise it as that of a console, we assume it does not support + // setting the title. Otherwise we check the ttyname and see if we believe it is a virtual + // terminal. + // + // One situation in which this breaks down is with screen, since screen supports setting the + // terminal title if the underlying terminal does so, but will print garbage on terminals that + // don't. Since we can't see the underlying terminal below screen there is no way to fix this. + if (term_str.missing()) return; const wchar_t *term = term_str.c_str(); bool recognized = false; recognized = recognized || contains(term, L"xterm", L"screen", L"nxterm", L"rxvt"); - recognized = recognized || ! wcsncmp(term, L"xterm-", wcslen(L"xterm-")); - recognized = recognized || ! wcsncmp(term, L"screen-", wcslen(L"screen-")); + recognized = recognized || !wcsncmp(term, L"xterm-", wcslen(L"xterm-")); + recognized = recognized || !wcsncmp(term, L"screen-", wcslen(L"screen-")); - if (! recognized) - { + if (!recognized) { char *n = ttyname(STDIN_FILENO); - if (contains(term, L"linux")) - { + if (contains(term, L"linux")) { return; } - if (contains(term, L"dumb")) - return; + if (contains(term, L"dumb")) return; - if (strstr(n, "tty") || strstr(n, "/vc/")) - return; + if (strstr(n, "tty") || strstr(n, "/vc/")) return; } wcstring fish_title_command = DEFAULT_TITLE; - if (function_exists(L"fish_title")) - { + if (function_exists(L"fish_title")) { fish_title_command = L"fish_title"; - if (! cmd.empty()) - { + if (!cmd.empty()) { fish_title_command.append(L" "); fish_title_command.append(parse_util_escape_string_with_quote(cmd, L'\0')); } @@ -928,13 +701,10 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) wcstring_list_t lst; proc_push_interactive(0); - if (exec_subshell(fish_title_command, lst, false /* do not apply exit status */) != -1) - { - if (! lst.empty()) - { + if (exec_subshell(fish_title_command, lst, false /* do not apply exit status */) != -1) { + if (!lst.empty()) { writestr(L"\x1b]0;"); - for (size_t i=0; i<lst.size(); i++) - { + for (size_t i = 0; i < lst.size(); i++) { writestr(lst.at(i).c_str()); } writestr(L"\7"); @@ -942,61 +712,52 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) } proc_pop_interactive(); set_color(rgb_color_t::reset(), rgb_color_t::reset()); - if (reset_cursor_position && ! lst.empty()) { - // Put the cursor back at the beginning of the line #2453 + if (reset_cursor_position && !lst.empty()) { + // Put the cursor back at the beginning of the line (issue #2453). writestr(L"\r"); } } -/** - Reexecute the prompt command. The output is inserted into data->prompt_buff. -*/ -static void exec_prompt() -{ - /* Clear existing prompts */ +/// Reexecute the prompt command. The output is inserted into data->prompt_buff. +static void exec_prompt() { + // Clear existing prompts. data->left_prompt_buff.clear(); data->right_prompt_buff.clear(); - /* Do not allow the exit status of the prompts to leak through */ + // Do not allow the exit status of the prompts to leak through. const bool apply_exit_status = false; - /* If we have any prompts, they must be run non-interactively */ - if (data->left_prompt.size() || data->right_prompt.size()) - { + // If we have any prompts, they must be run non-interactively. + if (data->left_prompt.size() || data->right_prompt.size()) { proc_push_interactive(0); - // Prepend any mode indicator to the left prompt (#1988) - if (function_exists(MODE_PROMPT_FUNCTION_NAME)) - { + // Prepend any mode indicator to the left prompt (issue #1988). + if (function_exists(MODE_PROMPT_FUNCTION_NAME)) { wcstring_list_t mode_indicator_list; exec_subshell(MODE_PROMPT_FUNCTION_NAME, mode_indicator_list, apply_exit_status); - // We do not support multiple lines in the mode indicator, so just concatenate all of them - for (size_t i = 0; i < mode_indicator_list.size(); i++) - { + // We do not support multiple lines in the mode indicator, so just concatenate all of + // them. + for (size_t i = 0; i < mode_indicator_list.size(); i++) { data->left_prompt_buff += mode_indicator_list.at(i); } } - if (! data->left_prompt.empty()) - { + if (!data->left_prompt.empty()) { wcstring_list_t prompt_list; - // ignore return status + // Ignore return status. exec_subshell(data->left_prompt, prompt_list, apply_exit_status); - for (size_t i = 0; i < prompt_list.size(); i++) - { + for (size_t i = 0; i < prompt_list.size(); i++) { if (i > 0) data->left_prompt_buff += L'\n'; data->left_prompt_buff += prompt_list.at(i); } } - if (! data->right_prompt.empty()) - { + if (!data->right_prompt.empty()) { wcstring_list_t prompt_list; - // status is ignored + // Status is ignored. exec_subshell(data->right_prompt, prompt_list, apply_exit_status); - for (size_t i = 0; i < prompt_list.size(); i++) - { - // Right prompt does not support multiple lines, so just concatenate all of them + for (size_t i = 0; i < prompt_list.size(); i++) { + // Right prompt does not support multiple lines, so just concatenate all of them. data->right_prompt_buff += prompt_list.at(i); } } @@ -1004,149 +765,119 @@ static void exec_prompt() proc_pop_interactive(); } - // Write the screen title. - // Do not reset the cursor position: exec_prompt is called when there may still be output - // on the line from the previous command (#2499) and we need our PROMPT_SP hack to work + // Write the screen title. Do not reset the cursor position: exec_prompt is called when there + // may still be output on the line from the previous command (#2499) and we need our PROMPT_SP + // hack to work. reader_write_title(L"", false); } -void reader_init() -{ +void reader_init() { VOMIT_ON_FAILURE(pthread_key_create(&generation_count_key, NULL)); - /* Save the initial terminal mode */ + // Save the initial terminal mode. tcgetattr(STDIN_FILENO, &terminal_mode_on_startup); - /* Set the mode used for program execution, initialized to the current mode */ - memcpy(&terminal_mode_for_executing_programs, &terminal_mode_on_startup, sizeof terminal_mode_for_executing_programs); - terminal_mode_for_executing_programs.c_iflag &= ~IXON; /* disable flow control */ - terminal_mode_for_executing_programs.c_iflag &= ~IXOFF; /* disable flow control */ + // Set the mode used for program execution, initialized to the current mode. + memcpy(&terminal_mode_for_executing_programs, &terminal_mode_on_startup, + sizeof terminal_mode_for_executing_programs); + terminal_mode_for_executing_programs.c_iflag &= ~IXON; // disable flow control + terminal_mode_for_executing_programs.c_iflag &= ~IXOFF; // disable flow control - /* Set the mode used for the terminal, initialized to the current mode */ + // Set the mode used for the terminal, initialized to the current mode. memcpy(&shell_modes, &terminal_mode_on_startup, sizeof shell_modes); - shell_modes.c_iflag &= ~ICRNL; /* turn off mapping CR (\cM) to NL (\cJ) */ - shell_modes.c_iflag &= ~INLCR; /* turn off mapping NL (\cJ) to CR (\cM) */ - shell_modes.c_lflag &= ~ICANON; /* turn off canonical mode */ - shell_modes.c_lflag &= ~ECHO; /* turn off echo mode */ - shell_modes.c_iflag &= ~IXON; /* disable flow control */ - shell_modes.c_iflag &= ~IXOFF; /* disable flow control */ - shell_modes.c_cc[VMIN]=1; - shell_modes.c_cc[VTIME]=0; + shell_modes.c_iflag &= ~ICRNL; // turn off mapping CR (\cM) to NL (\cJ) + shell_modes.c_iflag &= ~INLCR; // turn off mapping NL (\cJ) to CR (\cM) + shell_modes.c_lflag &= ~ICANON; // turn off canonical mode + shell_modes.c_lflag &= ~ECHO; // turn off echo mode + shell_modes.c_iflag &= ~IXON; // disable flow control + shell_modes.c_iflag &= ~IXOFF; // disable flow control + shell_modes.c_cc[VMIN] = 1; + shell_modes.c_cc[VTIME] = 0; #if defined(_POSIX_VDISABLE) - // PCA disable VDSUSP (typically control-Y), which is a funny job control - // function available only on OS X and BSD systems - // This lets us use control-Y for yank instead +// PCA disable VDSUSP (typically control-Y), which is a funny job control. function available only +// on OS X and BSD systems. This lets us use control-Y for yank instead. #ifdef VDSUSP shell_modes.c_cc[VDSUSP] = _POSIX_VDISABLE; #endif #endif - // We don't use term_steal because this can fail if fd 0 isn't associated - // with a tty and this function is run regardless of whether stdin is tied - // to a tty. This is harmless in that case. We do it unconditionally - // because disabling ICRNL mode (see above) needs to be done at the - // earliest possible moment. Doing it here means it will be done within - // approximately 1 ms of the start of the shell rather than 250 ms (or - // more) when reader_interactive_init is eventually called. + // We don't use term_steal because this can fail if fd 0 isn't associated with a tty and this + // function is run regardless of whether stdin is tied to a tty. This is harmless in that case. + // We do it unconditionally because disabling ICRNL mode (see above) needs to be done at the + // earliest possible moment. Doing it here means it will be done within approximately 1 ms of + // the start of the shell rather than 250 ms (or more) when reader_interactive_init is + // eventually called. // // TODO: Remove this condition when issue #2315 and #1041 are addressed. - if (is_interactive_session) - { - tcsetattr(STDIN_FILENO, TCSANOW,&shell_modes); + if (is_interactive_session) { + tcsetattr(STDIN_FILENO, TCSANOW, &shell_modes); } } +void reader_destroy() { pthread_key_delete(generation_count_key); } -void reader_destroy() -{ - pthread_key_delete(generation_count_key); -} - -void restore_term_mode() -{ - // Restore the term mode if we own the terminal - // It's important we do this before restore_foreground_process_group, otherwise we won't think we own the terminal - if (getpid() == tcgetpgrp(STDIN_FILENO)) - { +void restore_term_mode() { + // Restore the term mode if we own the terminal. It's important we do this before + // restore_foreground_process_group, otherwise we won't think we own the terminal. + if (getpid() == tcgetpgrp(STDIN_FILENO)) { tcsetattr(STDIN_FILENO, TCSANOW, &terminal_mode_on_startup); } } -void reader_exit(int do_exit, int forced) -{ - if (data) - data->end_loop=do_exit; - end_loop=do_exit; - if (forced) - exit_forced = 1; - +void reader_exit(int do_exit, int forced) { + if (data) data->end_loop = do_exit; + end_loop = do_exit; + if (forced) exit_forced = 1; } -void reader_repaint_needed() -{ - if (data) - { +void reader_repaint_needed() { + if (data) { data->repaint_needed = true; } } -void reader_repaint_if_needed() -{ - if (data == NULL) - return; +void reader_repaint_if_needed() { + if (data == NULL) return; bool needs_reset = data->screen_reset_needed; bool needs_repaint = needs_reset || data->repaint_needed; - if (needs_reset) - { + if (needs_reset) { exec_prompt(); s_reset(&data->screen, screen_reset_current_line_and_prompt); data->screen_reset_needed = false; } - if (needs_repaint) - { - reader_repaint(); - /* reader_repaint clears repaint_needed */ + if (needs_repaint) { + reader_repaint(); // reader_repaint clears repaint_needed } } -static void reader_repaint_if_needed_one_arg(void * unused) -{ - reader_repaint_if_needed(); -} +static void reader_repaint_if_needed_one_arg(void *unused) { reader_repaint_if_needed(); } -void reader_react_to_color_change() -{ - if (! data) - return; +void reader_react_to_color_change() { + if (!data) return; - if (! data->repaint_needed || ! data->screen_reset_needed) - { + if (!data->repaint_needed || !data->screen_reset_needed) { data->repaint_needed = true; data->screen_reset_needed = true; input_common_add_callback(reader_repaint_if_needed_one_arg, NULL); } } - -/* Indicates if the given command char ends paging */ -static bool command_ends_paging(wchar_t c, bool focused_on_search_field) -{ - switch (c) - { - /* These commands always end paging */ +/// Indicates if the given command char ends paging. +static bool command_ends_paging(wchar_t c, bool focused_on_search_field) { + switch (c) { case R_HISTORY_SEARCH_BACKWARD: case R_HISTORY_SEARCH_FORWARD: case R_HISTORY_TOKEN_SEARCH_BACKWARD: case R_HISTORY_TOKEN_SEARCH_FORWARD: case R_ACCEPT_AUTOSUGGESTION: - case R_CANCEL: + case R_CANCEL: { + // These commands always end paging. return true; - - /* These commands never do */ + } case R_COMPLETE: case R_COMPLETE_AND_SEARCH: case R_BACKWARD_CHAR: @@ -1158,14 +889,15 @@ static bool command_ends_paging(wchar_t c, bool focused_on_search_field) case R_SUPPRESS_AUTOSUGGESTION: case R_BEGINNING_OF_HISTORY: case R_END_OF_HISTORY: - default: + default: { + // These commands never do. return false; - - /* R_EXECUTE does end paging, but only executes if it was not paging. So it's handled specially */ - case R_EXECUTE: + } + case R_EXECUTE: { + // R_EXECUTE does end paging, but only executes if it was not paging. So it's handled + // specially. return false; - - /* These commands operate on the search field if that's where the focus is */ + } case R_BEGINNING_OF_LINE: case R_END_OF_LINE: case R_FORWARD_WORD: @@ -1193,31 +925,28 @@ static bool command_ends_paging(wchar_t c, bool focused_on_search_field) case R_VI_ARG_DIGIT: case R_VI_DELETE_TO: case R_BEGINNING_OF_BUFFER: - case R_END_OF_BUFFER: - return ! focused_on_search_field; + case R_END_OF_BUFFER: { + // These commands operate on the search field if that's where the focus is. + return !focused_on_search_field; + } } } -/** - Remove the previous character in the character buffer and on the - screen using syntax highlighting, etc. -*/ -static void remove_backward() -{ +/// Remove the previous character in the character buffer and on the screen using syntax +/// highlighting, etc. +static void remove_backward() { editable_line_t *el = data->active_edit_line(); - if (el->position <= 0) - return; + if (el->position <= 0) return; - /* Fake composed character sequences by continuing to delete until we delete a character of width at least 1. */ + // Fake composed character sequences by continuing to delete until we delete a character of + // width at least 1. int width; - do - { + do { update_buff_pos(el, el->position - 1); width = fish_wcwidth(el->text.at(el->position)); el->text.erase(el->position, 1); - } - while (width == 0 && el->position > 0); + } while (width == 0 && el->position > 0); data->command_line_changed(el); data->suppress_autosuggestion = true; @@ -1226,39 +955,39 @@ static void remove_backward() reader_repaint_needed(); } - -/** - Insert the characters of the string into the command line buffer - and print them to the screen using syntax highlighting, etc. - Optionally also expand abbreviations, after space characters. - Returns true if the string changed. -*/ -static bool insert_string(editable_line_t *el, const wcstring &str, bool allow_expand_abbreviations = false) -{ +/// Insert the characters of the string into the command line buffer and print them to the screen +/// using syntax highlighting, etc. Optionally also expand abbreviations, after space characters. +/// Returns true if the string changed. +static bool insert_string(editable_line_t *el, const wcstring &str, + bool allow_expand_abbreviations = false) { size_t len = str.size(); - if (len == 0) - return false; + if (len == 0) return false; - /* Start inserting. If we are expanding abbreviations, we have to do this after every space (see #1434), so look for spaces. We try to do this efficiently (rather than the simpler character at a time) to avoid expensive work in command_line_changed() */ + // Start inserting. If we are expanding abbreviations, we have to do this after every space (see + // #1434), so look for spaces. We try to do this efficiently (rather than the simpler character + // at a time) to avoid expensive work in command_line_changed(). size_t cursor = 0; - while (cursor < len) - { - /* Determine the position of the next expansion-triggering char (possibly none), and the end of the range we wish to insert */ + while (cursor < len) { + // Determine the position of the next expansion-triggering char (possibly none), and the end + // of the range we wish to insert. const wchar_t *expansion_triggering_chars = L" ;|&^><"; - size_t char_triggering_expansion_pos = allow_expand_abbreviations ? str.find_first_of(expansion_triggering_chars, cursor) : wcstring::npos; + size_t char_triggering_expansion_pos = + allow_expand_abbreviations ? str.find_first_of(expansion_triggering_chars, cursor) + : wcstring::npos; bool has_expansion_triggering_char = (char_triggering_expansion_pos != wcstring::npos); - size_t range_end = (has_expansion_triggering_char ? char_triggering_expansion_pos + 1 : len); + size_t range_end = + (has_expansion_triggering_char ? char_triggering_expansion_pos + 1 : len); - /* Insert from the cursor up to but not including the range end */ + // Insert from the cursor up to but not including the range end. assert(range_end > cursor); el->insert_string(str, cursor, range_end - cursor); update_buff_pos(el, el->position); data->command_line_changed(el); - /* If we got an expansion trigger, then the last character we inserted was it (i.e. was a space). Expand abbreviations. */ - if (has_expansion_triggering_char && allow_expand_abbreviations) - { + // If we got an expansion trigger, then the last character we inserted was it (i.e. was a + // space). Expand abbreviations. + if (has_expansion_triggering_char && allow_expand_abbreviations) { assert(range_end > 0); assert(wcschr(expansion_triggering_chars, str.at(range_end - 1))); data->expand_abbreviation_as_necessary(1); @@ -1266,11 +995,11 @@ static bool insert_string(editable_line_t *el, const wcstring &str, bool allow_e cursor = range_end; } - if (el == &data->command_line) - { + if (el == &data->command_line) { data->suppress_autosuggestion = false; - /* Syntax highlight. Note we must have that buff_pos > 0 because we just added something nonzero to its length */ + // Syntax highlight. Note we must have that buff_pos > 0 because we just added something + // nonzero to its length. assert(el->position > 0); reader_super_highlight_me_plenty(-1); } @@ -1280,29 +1009,28 @@ static bool insert_string(editable_line_t *el, const wcstring &str, bool allow_e return true; } -/** - Insert the character into the command line buffer and print it to - the screen using syntax highlighting, etc. -*/ -static bool insert_char(editable_line_t *el, wchar_t c, bool allow_expand_abbreviations = false) -{ +/// Insert the character into the command line buffer and print it to the screen using syntax +/// highlighting, etc. +static bool insert_char(editable_line_t *el, wchar_t c, bool allow_expand_abbreviations = false) { return insert_string(el, wcstring(1, c), allow_expand_abbreviations); } - -/** - Insert the string in the given command line at the given cursor - position. The function checks if the string is quoted or not and - correctly escapes the string. - \param val the string to insert - \param flags A union of all flags describing the completion to insert. See the completion_t struct for more information on possible values. - \param command_line The command line into which we will insert - \param inout_cursor_pos On input, the location of the cursor within the command line. On output, the new desired position. - \param append_only Whether we can only append to the command line, or also modify previous characters. This is used to determine whether we go inside a trailing quote. - \return The completed string -*/ -wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flags_t flags, const wcstring &command_line, size_t *inout_cursor_pos, bool append_only) -{ +/// Insert the string in the given command line at the given cursor position. The function checks if +/// the string is quoted or not and correctly escapes the string. +/// +/// \param val the string to insert +/// \param flags A union of all flags describing the completion to insert. See the completion_t +/// struct for more information on possible values. +/// \param command_line The command line into which we will insert +/// \param inout_cursor_pos On input, the location of the cursor within the command line. On output, +/// the new desired position. +/// \param append_only Whether we can only append to the command line, or also modify previous +/// characters. This is used to determine whether we go inside a trailing quote. +/// +/// \return The completed string +wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flags_t flags, + const wcstring &command_line, size_t *inout_cursor_pos, + bool append_only) { const wchar_t *val = val_str.c_str(); bool add_space = !(flags & COMPLETE_NO_SPACE); bool do_replace = !!(flags & COMPLETE_REPLACES_TOKEN); @@ -1311,8 +1039,7 @@ wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flag const size_t cursor_pos = *inout_cursor_pos; bool back_into_trailing_quote = false; - if (do_replace) - { + if (do_replace) { size_t move_cursor; const wchar_t *begin, *end; @@ -1322,23 +1049,19 @@ wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flag wcstring sb(buff, begin - buff); - if (do_escape) - { - /* Respect COMPLETE_DONT_ESCAPE_TILDES */ + if (do_escape) { + // Respect COMPLETE_DONT_ESCAPE_TILDES. bool no_tilde = !!(flags & COMPLETE_DONT_ESCAPE_TILDES); - wcstring escaped = escape(val, ESCAPE_ALL | ESCAPE_NO_QUOTED | (no_tilde ? ESCAPE_NO_TILDE : 0)); + wcstring escaped = + escape(val, ESCAPE_ALL | ESCAPE_NO_QUOTED | (no_tilde ? ESCAPE_NO_TILDE : 0)); sb.append(escaped); move_cursor = escaped.size(); - } - else - { + } else { sb.append(val); move_cursor = wcslen(val); } - - if (add_space) - { + if (add_space) { sb.append(L" "); move_cursor += 1; } @@ -1347,52 +1070,48 @@ wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flag size_t new_cursor_pos = (begin - buff) + move_cursor; *inout_cursor_pos = new_cursor_pos; return sb; - } - else - { + } else { wchar_t quote = L'\0'; wcstring replaced; - if (do_escape) - { - /* Note that we ignore COMPLETE_DONT_ESCAPE_TILDES here. We get away with this because unexpand_tildes only operates on completions that have COMPLETE_REPLACES_TOKEN set, but we ought to respect them */ + if (do_escape) { + // Note that we ignore COMPLETE_DONT_ESCAPE_TILDES here. We get away with this because + // unexpand_tildes only operates on completions that have COMPLETE_REPLACES_TOKEN set, + // but we ought to respect them. parse_util_get_parameter_info(command_line, cursor_pos, "e, NULL, NULL); - /* If the token is reported as unquoted, but ends with a (unescaped) quote, and we can modify the command line, then delete the trailing quote so that we can insert within the quotes instead of after them. See https://github.com/fish-shell/fish-shell/issues/552 */ - if (quote == L'\0' && ! append_only && cursor_pos > 0) - { - /* The entire token is reported as unquoted...see if the last character is an unescaped quote */ + // If the token is reported as unquoted, but ends with a (unescaped) quote, and we can + // modify the command line, then delete the trailing quote so that we can insert within + // the quotes instead of after them. See issue #552. + if (quote == L'\0' && !append_only && cursor_pos > 0) { + // The entire token is reported as unquoted...see if the last character is an + // unescaped quote. wchar_t trailing_quote = unescaped_quote(command_line, cursor_pos - 1); - if (trailing_quote != L'\0') - { + if (trailing_quote != L'\0') { quote = trailing_quote; back_into_trailing_quote = true; } } replaced = parse_util_escape_string_with_quote(val_str, quote); - } - else - { + } else { replaced = val; } size_t insertion_point = cursor_pos; - if (back_into_trailing_quote) - { - /* Move the character back one so we enter the terminal quote */ + if (back_into_trailing_quote) { + // Move the character back one so we enter the terminal quote. assert(insertion_point > 0); insertion_point--; } - /* Perform the insertion and compute the new location */ + // Perform the insertion and compute the new location. wcstring result = command_line; result.insert(insertion_point, replaced); - size_t new_cursor_pos = insertion_point + replaced.size() + (back_into_trailing_quote ? 1 : 0); - if (add_space) - { - if (quote != L'\0' && unescaped_quote(command_line, insertion_point) != quote) - { - /* This is a quoted parameter, first print a quote */ + size_t new_cursor_pos = + insertion_point + replaced.size() + (back_into_trailing_quote ? 1 : 0); + if (add_space) { + if (quote != L'\0' && unescaped_quote(command_line, insertion_point) != quote) { + // This is a quoted parameter, first print a quote. result.insert(new_cursor_pos++, wcstring("e, 1)); } result.insert(new_cursor_pos++, L" "); @@ -1402,28 +1121,24 @@ wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flag } } -/** - Insert the string at the current cursor position. The function - checks if the string is quoted or not and correctly escapes the - string. - - \param val the string to insert - \param flags A union of all flags describing the completion to insert. See the completion_t struct for more information on possible values. - -*/ -static void completion_insert(const wchar_t *val, complete_flags_t flags) -{ +/// Insert the string at the current cursor position. The function checks if the string is quoted or +/// not and correctly escapes the string. +/// +/// \param val the string to insert +/// \param flags A union of all flags describing the completion to insert. See the completion_t +/// struct for more information on possible values. +static void completion_insert(const wchar_t *val, complete_flags_t flags) { editable_line_t *el = data->active_edit_line(); size_t cursor = el->position; - wcstring new_command_line = completion_apply_to_command_line(val, flags, el->text, &cursor, false /* not append only */); + wcstring new_command_line = completion_apply_to_command_line(val, flags, el->text, &cursor, + false /* not append only */); reader_set_buffer_maintaining_pager(new_command_line, cursor); - /* Since we just inserted a completion, don't immediately do a new autosuggestion */ + // Since we just inserted a completion, don't immediately do a new autosuggestion. data->suppress_autosuggestion = true; } -struct autosuggestion_context_t -{ +struct autosuggestion_context_t { wcstring search_string; wcstring autosuggestion; size_t cursor_pos; @@ -1433,78 +1148,67 @@ struct autosuggestion_context_t const env_vars_snapshot_t vars; const unsigned int generation_count; - autosuggestion_context_t(history_t *history, const wcstring &term, size_t pos) : - search_string(term), - cursor_pos(pos), - searcher(*history, term, HISTORY_SEARCH_TYPE_PREFIX), - detector(history), - working_directory(env_get_pwd_slash()), - vars(env_vars_snapshot_t::highlighting_keys), - generation_count(s_generation_count) - { - } - - /* The function run in the background thread to determine an autosuggestion */ - int threaded_autosuggest(void) - { + autosuggestion_context_t(history_t *history, const wcstring &term, size_t pos) + : search_string(term), + cursor_pos(pos), + searcher(*history, term, HISTORY_SEARCH_TYPE_PREFIX), + detector(history), + working_directory(env_get_pwd_slash()), + vars(env_vars_snapshot_t::highlighting_keys), + generation_count(s_generation_count) {} + + // The function run in the background thread to determine an autosuggestion. + int threaded_autosuggest(void) { ASSERT_IS_BACKGROUND_THREAD(); - /* If the main thread has moved on, skip all the work */ - if (generation_count != s_generation_count) - { + // If the main thread has moved on, skip all the work. + if (generation_count != s_generation_count) { return 0; } - VOMIT_ON_FAILURE(pthread_setspecific(generation_count_key, (void*)(uintptr_t) generation_count)); + VOMIT_ON_FAILURE( + pthread_setspecific(generation_count_key, (void *)(uintptr_t)generation_count)); - /* Let's make sure we aren't using the empty string */ - if (search_string.empty()) - { + // Let's make sure we aren't using the empty string. + if (search_string.empty()) { return 0; } - while (! reader_thread_job_is_stale() && searcher.go_backwards()) - { + while (!reader_thread_job_is_stale() && searcher.go_backwards()) { history_item_t item = searcher.current_item(); - /* Skip items with newlines because they make terrible autosuggestions */ - if (item.str().find('\n') != wcstring::npos) - continue; + // Skip items with newlines because they make terrible autosuggestions. + if (item.str().find('\n') != wcstring::npos) continue; - if (autosuggest_validate_from_history(item, detector, working_directory, vars)) - { - /* The command autosuggestion was handled specially, so we're done */ + if (autosuggest_validate_from_history(item, detector, working_directory, vars)) { + // The command autosuggestion was handled specially, so we're done. this->autosuggestion = searcher.current_string(); return 1; } } - /* Maybe cancel here */ - if (reader_thread_job_is_stale()) - return 0; + // Maybe cancel here. + if (reader_thread_job_is_stale()) return 0; - // Here we do something a little funny - // If the line ends with a space, and the cursor is not at the end, - // don't use completion autosuggestions. It ends up being pretty weird seeing stuff get spammed on the right - // while you go back to edit a line + // Here we do something a little funny. If the line ends with a space, and the cursor is not + // at the end, don't use completion autosuggestions. It ends up being pretty weird seeing + // stuff get spammed on the right while you go back to edit a line const wchar_t last_char = search_string.at(search_string.size() - 1); const bool cursor_at_end = (this->cursor_pos == search_string.size()); - if (! cursor_at_end && iswspace(last_char)) - return 0; + if (!cursor_at_end && iswspace(last_char)) return 0; - /* On the other hand, if the line ends with a quote, don't go dumping stuff after the quote */ - if (wcschr(L"'\"", last_char) && cursor_at_end) - return 0; + // On the other hand, if the line ends with a quote, don't go dumping stuff after the quote. + if (wcschr(L"'\"", last_char) && cursor_at_end) return 0; - /* Try normal completions */ + // Try normal completions. std::vector<completion_t> completions; complete(search_string, &completions, COMPLETION_REQUEST_AUTOSUGGESTION, vars); completions_sort_and_prioritize(&completions); - if (! completions.empty()) - { + if (!completions.empty()) { const completion_t &comp = completions.at(0); size_t cursor = this->cursor_pos; - this->autosuggestion = completion_apply_to_command_line(comp.completion, comp.flags, this->search_string, &cursor, true /* append only */); + this->autosuggestion = completion_apply_to_command_line( + comp.completion, comp.flags, this->search_string, &cursor, true /* append only */); return 1; } @@ -1512,30 +1216,23 @@ struct autosuggestion_context_t } }; -static int threaded_autosuggest(autosuggestion_context_t *ctx) -{ +static int threaded_autosuggest(autosuggestion_context_t *ctx) { return ctx->threaded_autosuggest(); } -static bool can_autosuggest(void) -{ - /* We autosuggest if suppress_autosuggestion is not set, if we're not doing a history search, and our command line contains a non-whitespace character. */ +static bool can_autosuggest(void) { + // We autosuggest if suppress_autosuggestion is not set, if we're not doing a history search, + // and our command line contains a non-whitespace character. const editable_line_t *el = data->active_edit_line(); const wchar_t *whitespace = L" \t\r\n\v"; - return ! data->suppress_autosuggestion && - data->history_search.is_at_end() && - el == &data->command_line && - el->text.find_first_not_of(whitespace) != wcstring::npos; + return !data->suppress_autosuggestion && data->history_search.is_at_end() && + el == &data->command_line && el->text.find_first_not_of(whitespace) != wcstring::npos; } -static void autosuggest_completed(autosuggestion_context_t *ctx, int result) -{ - if (result && - can_autosuggest() && - ctx->search_string == data->command_line.text && - string_prefixes_string_case_insensitive(ctx->search_string, ctx->autosuggestion)) - { - /* Autosuggestion is active and the search term has not changed, so we're good to go */ +static void autosuggest_completed(autosuggestion_context_t *ctx, int result) { + if (result && can_autosuggest() && ctx->search_string == data->command_line.text && + string_prefixes_string_case_insensitive(ctx->search_string, ctx->autosuggestion)) { + // Autosuggestion is active and the search term has not changed, so we're good to go. data->autosuggestion = ctx->autosuggestion; sanity_check(); reader_repaint(); @@ -1543,42 +1240,36 @@ static void autosuggest_completed(autosuggestion_context_t *ctx, int result) delete ctx; } - -static void update_autosuggestion(void) -{ - /* Updates autosuggestion. We look for an autosuggestion if the command line is non-empty and if we're not doing a history search. */ +static void update_autosuggestion(void) { + // Updates autosuggestion. We look for an autosuggestion if the command line is non-empty and if + // we're not doing a history search. data->autosuggestion.clear(); - if (data->allow_autosuggestion && ! data->suppress_autosuggestion && ! data->command_line.empty() && data->history_search.is_at_end()) - { + if (data->allow_autosuggestion && !data->suppress_autosuggestion && + !data->command_line.empty() && data->history_search.is_at_end()) { const editable_line_t *el = data->active_edit_line(); - autosuggestion_context_t *ctx = new autosuggestion_context_t(data->history, el->text, el->position); + autosuggestion_context_t *ctx = + new autosuggestion_context_t(data->history, el->text, el->position); iothread_perform(threaded_autosuggest, autosuggest_completed, ctx); } } -/* Accept any autosuggestion by replacing the command line with it. If full is true, take the whole thing; if it's false, then take only the first "word" */ -static void accept_autosuggestion(bool full) -{ - if (! data->autosuggestion.empty()) - { - /* Accepting an autosuggestion clears the pager */ +// Accept any autosuggestion by replacing the command line with it. If full is true, take the whole +// thing; if it's false, then take only the first "word". +static void accept_autosuggestion(bool full) { + if (!data->autosuggestion.empty()) { + // Accepting an autosuggestion clears the pager. clear_pager(); - /* Accept the autosuggestion */ - if (full) - { - /* Just take the whole thing */ + // Accept the autosuggestion. + if (full) { + // Just take the whole thing. data->command_line.text = data->autosuggestion; - } - else - { - /* Accept characters up to a word separator */ + } else { + // Accept characters up to a word separator. move_word_state_machine_t state(move_word_style_punctuation); - for (size_t idx = data->command_line.size(); idx < data->autosuggestion.size(); idx++) - { + for (size_t idx = data->command_line.size(); idx < data->autosuggestion.size(); idx++) { wchar_t wc = data->autosuggestion.at(idx); - if (! state.consume_char(wc)) - break; + if (!state.consume_char(wc)) break; data->command_line.text.push_back(wc); } } @@ -1589,40 +1280,32 @@ static void accept_autosuggestion(bool full) } } -/* Ensure we have no pager contents */ -static void clear_pager() -{ - if (data) - { +// Ensure we have no pager contents. +static void clear_pager() { + if (data) { data->pager.clear(); data->current_page_rendering = page_rendering_t(); reader_repaint_needed(); } } -static void select_completion_in_direction(enum selection_direction_t dir) -{ +static void select_completion_in_direction(enum selection_direction_t dir) { assert(data != NULL); - bool selection_changed = data->pager.select_next_completion_in_direction(dir, data->current_page_rendering); - if (selection_changed) - { + bool selection_changed = + data->pager.select_next_completion_in_direction(dir, data->current_page_rendering); + if (selection_changed) { data->pager_selection_changed(); } } -/** - Flash the screen. This function changes the color of the - current line momentarily and sends a BEL to maybe flash the - screen or emite a sound, depending on how it is configured. -*/ -static void reader_flash() -{ +/// Flash the screen. This function changes the color of the current line momentarily and sends a +/// BEL to maybe flash the screen or emite a sound, depending on how it is configured. +static void reader_flash() { struct timespec pollint; editable_line_t *el = &data->command_line; - for (size_t i=0; i<el->position; i++) - { - data->colors.at(i) = highlight_spec_search_match<<16; + for (size_t i = 0; i < el->position; i++) { + data->colors.at(i) = highlight_spec_search_match << 16; } reader_repaint(); @@ -1637,120 +1320,90 @@ static void reader_flash() reader_repaint(); } -/** - Characters that may not be part of a token that is to be replaced - by a case insensitive completion. - */ +/// Characters that may not be part of a token that is to be replaced by a case insensitive +/// completion. #define REPLACE_UNCLEAN L"$*?({})" -/** - Check if the specified string can be replaced by a case insensitive - completion with the specified flags. - - Advanced tokens like those containing {}-style expansion can not at - the moment be replaced, other than if the new token is already an - exact replacement, e.g. if the COMPLETE_DONT_ESCAPE flag is set. - */ - -static bool reader_can_replace(const wcstring &in, int flags) -{ +/// Check if the specified string can be replaced by a case insensitive completion with the +/// specified flags. +/// +/// Advanced tokens like those containing {}-style expansion can not at the moment be replaced, +/// other than if the new token is already an exact replacement, e.g. if the COMPLETE_DONT_ESCAPE +/// flag is set. +static bool reader_can_replace(const wcstring &in, int flags) { + const wchar_t *str = in.c_str(); - const wchar_t * str = in.c_str(); - - if (flags & COMPLETE_DONT_ESCAPE) - { + if (flags & COMPLETE_DONT_ESCAPE) { return true; } - /* - Test characters that have a special meaning in any character position - */ - while (*str) - { - if (wcschr(REPLACE_UNCLEAN, *str)) - return false; + + // Test characters that have a special meaning in any character position. + while (*str) { + if (wcschr(REPLACE_UNCLEAN, *str)) return false; str++; } return true; } -/* Determine the best match type for a set of completions */ -static fuzzy_match_type_t get_best_match_type(const std::vector<completion_t> &comp) -{ +/// Determine the best match type for a set of completions. +static fuzzy_match_type_t get_best_match_type(const std::vector<completion_t> &comp) { fuzzy_match_type_t best_type = fuzzy_match_none; - for (size_t i=0; i < comp.size(); i++) - { + for (size_t i = 0; i < comp.size(); i++) { best_type = std::min(best_type, comp.at(i).match.type); } - /* If the best type is an exact match, reduce it to prefix match. Otherwise a tab completion will only show one match if it matches a file exactly. (see issue #959) */ - if (best_type == fuzzy_match_exact) - { + // If the best type is an exact match, reduce it to prefix match. Otherwise a tab completion + // will only show one match if it matches a file exactly. (see issue #959). + if (best_type == fuzzy_match_exact) { best_type = fuzzy_match_prefix; } return best_type; } -/** - Handle the list of completions. This means the following: - - - If the list is empty, flash the terminal. - - If the list contains one element, write the whole element, and if - the element does not end on a '/', '@', ':', or a '=', also write a trailing - space. - - If the list contains multiple elements with a common prefix, write - the prefix. - - If the list contains multiple elements without a common prefix, call - run_pager to display a list of completions. Depending on terminal size and - the length of the list, run_pager may either show less than a screenfull and - exit or use an interactive pager to allow the user to scroll through the - completions. - - \param comp the list of completion strings - \param continue_after_prefix_insertion If we have a shared prefix, whether to print the list of completions after inserting it. - - Return true if we inserted text into the command line, false if we did not. -*/ - -static bool handle_completions(const std::vector<completion_t> &comp, bool continue_after_prefix_insertion) -{ +/// Handle the list of completions. This means the following: +/// +/// - If the list is empty, flash the terminal. +/// - If the list contains one element, write the whole element, and if the element does not end on +/// a '/', '@', ':', or a '=', also write a trailing space. +/// - If the list contains multiple elements with a common prefix, write the prefix. +/// - If the list contains multiple elements without a common prefix, call run_pager to display a +/// list of completions. Depending on terminal size and the length of the list, run_pager may either +/// show less than a screenfull and exit or use an interactive pager to allow the user to scroll +/// through the completions. +/// +/// \param comp the list of completion strings +/// \param continue_after_prefix_insertion If we have a shared prefix, whether to print the list of +/// completions after inserting it. +/// +/// Return true if we inserted text into the command line, false if we did not. +static bool handle_completions(const std::vector<completion_t> &comp, + bool continue_after_prefix_insertion) { bool done = false; bool success = false; const editable_line_t *el = &data->command_line; const wchar_t *begin, *end, *buff = el->text.c_str(); parse_util_token_extent(buff, el->position, &begin, 0, 0, 0); - end = buff+el->position; + end = buff + el->position; const wcstring tok(begin, end - begin); - /* - Check trivial cases - */ - switch (comp.size()) - { - /* No suitable completions found, flash screen and return */ - case 0: - { + // Check trivial cases. + switch (comp.size()) { + case 0: { + // No suitable completions found, flash screen and return. reader_flash(); done = true; success = false; break; } - - /* Exactly one suitable completion found - insert it */ - case 1: - { - + case 1: { + // Exactly one suitable completion found - insert it. const completion_t &c = comp.at(0); - /* - If this is a replacement completion, check - that we know how to replace it, e.g. that - the token doesn't contain evil operators - like {} - */ - if (!(c.flags & COMPLETE_REPLACES_TOKEN) || reader_can_replace(tok, c.flags)) - { + // If this is a replacement completion, check that we know how to replace it, e.g. that + // the token doesn't contain evil operators like {}. + if (!(c.flags & COMPLETE_REPLACES_TOKEN) || reader_can_replace(tok, c.flags)) { completion_insert(c.completion.c_str(), c.flags); } done = true; @@ -1759,103 +1412,90 @@ static bool handle_completions(const std::vector<completion_t> &comp, bool conti } } - - if (!done) - { + if (!done) { fuzzy_match_type_t best_match_type = get_best_match_type(comp); - /* Determine whether we are going to replace the token or not. If any commands of the best type do not require replacement, then ignore all those that want to use replacement */ + // Determine whether we are going to replace the token or not. If any commands of the best + // type do not require replacement, then ignore all those that want to use replacement. bool will_replace_token = true; - for (size_t i=0; i< comp.size(); i++) - { + for (size_t i = 0; i < comp.size(); i++) { const completion_t &el = comp.at(i); - if (el.match.type <= best_match_type && !(el.flags & COMPLETE_REPLACES_TOKEN)) - { + if (el.match.type <= best_match_type && !(el.flags & COMPLETE_REPLACES_TOKEN)) { will_replace_token = false; break; } } - /* Decide which completions survived. There may be a lot of them; it would be nice if we could figure out how to avoid copying them here */ + // Decide which completions survived. There may be a lot of them; it would be nice if we + // could figure out how to avoid copying them here. std::vector<completion_t> surviving_completions; - for (size_t i=0; i < comp.size(); i++) - { + for (size_t i = 0; i < comp.size(); i++) { const completion_t &el = comp.at(i); - /* Ignore completions with a less suitable match type than the best. */ - if (el.match.type > best_match_type) - continue; + // Ignore completions with a less suitable match type than the best. + if (el.match.type > best_match_type) continue; - /* Only use completions that match replace_token */ + // Only use completions that match replace_token. bool completion_replace_token = !!(el.flags & COMPLETE_REPLACES_TOKEN); - if (completion_replace_token != will_replace_token) - continue; + if (completion_replace_token != will_replace_token) continue; - /* Don't use completions that want to replace, if we cannot replace them */ - if (completion_replace_token && ! reader_can_replace(tok, el.flags)) - continue; + // Don't use completions that want to replace, if we cannot replace them. + if (completion_replace_token && !reader_can_replace(tok, el.flags)) continue; - /* This completion survived */ + // This completion survived. surviving_completions.push_back(el); } - - /* Try to find a common prefix to insert among the surviving completions */ + // Try to find a common prefix to insert among the surviving completions. wcstring common_prefix; complete_flags_t flags = 0; bool prefix_is_partial_completion = false; - for (size_t i=0; i < surviving_completions.size(); i++) - { + for (size_t i = 0; i < surviving_completions.size(); i++) { const completion_t &el = surviving_completions.at(i); - if (i == 0) - { - /* First entry, use the whole string */ + if (i == 0) { + // First entry, use the whole string. common_prefix = el.completion; flags = el.flags; - } - else - { - /* Determine the shared prefix length. */ + } else { + // Determine the shared prefix length. size_t idx, max = mini(common_prefix.size(), el.completion.size()); - for (idx=0; idx < max; idx++) - { + for (idx = 0; idx < max; idx++) { wchar_t ac = common_prefix.at(idx), bc = el.completion.at(idx); bool matches = (ac == bc); - /* If we are replacing the token, allow case to vary */ - if (will_replace_token && ! matches) - { - /* Hackish way to compare two strings in a case insensitive way, hopefully better than towlower(). */ + // If we are replacing the token, allow case to vary. + if (will_replace_token && !matches) { + // Hackish way to compare two strings in a case insensitive way, hopefully + // better than towlower(). matches = (wcsncasecmp(&ac, &bc, 1) == 0); } - if (! matches) - break; + if (!matches) break; } - /* idx is now the length of the new common prefix */ + // idx is now the length of the new common prefix. common_prefix.resize(idx); prefix_is_partial_completion = true; - /* Early out if we decide there's no common prefix */ - if (idx == 0) - break; + // Early out if we decide there's no common prefix. + if (idx == 0) break; } } - /* Determine if we use the prefix. We use it if it's non-empty and it will actually make the command line longer. It may make the command line longer by virtue of not using REPLACE_TOKEN (so it always appends to the command line), or by virtue of replacing the token but being longer than it. */ + // Determine if we use the prefix. We use it if it's non-empty and it will actually make the + // command line longer. It may make the command line longer by virtue of not using + // REPLACE_TOKEN (so it always appends to the command line), or by virtue of replacing the + // token but being longer than it. bool use_prefix = common_prefix.size() > (will_replace_token ? tok.size() : 0); - assert(! use_prefix || ! common_prefix.empty()); + assert(!use_prefix || !common_prefix.empty()); - if (use_prefix) - { - /* We got something. If more than one completion contributed, then it means we have a prefix; don't insert a space after it */ - if (prefix_is_partial_completion) - flags |= COMPLETE_NO_SPACE; + if (use_prefix) { + // We got something. If more than one completion contributed, then it means we have a + // prefix; don't insert a space after it. + if (prefix_is_partial_completion) flags |= COMPLETE_NO_SPACE; completion_insert(common_prefix.c_str(), flags); success = true; } - if (continue_after_prefix_insertion || ! use_prefix) - { - /* We didn't get a common prefix, or we want to print the list anyways. */ + if (continue_after_prefix_insertion || !use_prefix) { + // We didn't get a common prefix, or we want to print the list anyways. size_t len, prefix_start = 0; wcstring prefix; parse_util_get_parameter_info(el->text, el->position, NULL, &prefix_start, NULL); @@ -1863,173 +1503,140 @@ static bool handle_completions(const std::vector<completion_t> &comp, bool conti assert(el->position >= prefix_start); len = el->position - prefix_start; - if (will_replace_token || match_type_requires_full_replacement(best_match_type)) - { - // No prefix + if (will_replace_token || match_type_requires_full_replacement(best_match_type)) { + // No prefix. prefix.clear(); - } - else if (len <= PREFIX_MAX_LEN) - { + } else if (len <= PREFIX_MAX_LEN) { prefix.append(el->text, prefix_start, len); - } - else - { - // append just the end of the string + } else { + // Append just the end of the string. prefix = wcstring(&ellipsis_char, 1); prefix.append(el->text, prefix_start + len - PREFIX_MAX_LEN, PREFIX_MAX_LEN); } wchar_t quote; parse_util_get_parameter_info(el->text, el->position, "e, NULL, NULL); - - /* Update the pager data */ + // Update the pager data. data->pager.set_prefix(prefix); data->pager.set_completions(surviving_completions); - - /* Invalidate our rendering */ + // Invalidate our rendering. data->current_page_rendering = page_rendering_t(); - - /* Modify the command line to reflect the new pager */ + // Modify the command line to reflect the new pager. data->pager_selection_changed(); - reader_repaint_needed(); - success = false; } } return success; } -/* Return true if we believe ourselves to be orphaned. loop_count is how many times we've tried to stop ourselves via SIGGTIN */ -static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgid) -{ +/// Return true if we believe ourselves to be orphaned. loop_count is how many times we've tried to +/// stop ourselves via SIGGTIN. +static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgid) { bool we_think_we_are_orphaned = false; - /* Try kill-0'ing the process whose pid corresponds to our process group ID. It's possible this will fail because we don't have permission to signal it. But more likely it will fail because it no longer exists, and we are orphaned. */ - if (loop_count % 64 == 0) - { - if (kill(shell_pgid, 0) < 0 && errno == ESRCH) - { + // Try kill-0'ing the process whose pid corresponds to our process group ID. It's possible this + // will fail because we don't have permission to signal it. But more likely it will fail because + // it no longer exists, and we are orphaned. + if (loop_count % 64 == 0) { + if (kill(shell_pgid, 0) < 0 && errno == ESRCH) { we_think_we_are_orphaned = true; } } - if (! we_think_we_are_orphaned && loop_count % 128 == 0) - { - /* Try reading from the tty; if we get EIO we are orphaned. This is sort of bad because it may block. */ - + if (!we_think_we_are_orphaned && loop_count % 128 == 0) { + // Try reading from the tty; if we get EIO we are orphaned. This is sort of bad because it + // may block. char *tty = ctermid(NULL); - if (! tty) - { + if (!tty) { wperror(L"ctermid"); exit_without_destructors(1); } - /* Open the tty. Presumably this is stdin, but maybe not? */ + // Open the tty. Presumably this is stdin, but maybe not? int tty_fd = open(tty, O_RDONLY | O_NONBLOCK); - if (tty_fd < 0) - { + if (tty_fd < 0) { wperror(L"open"); exit_without_destructors(1); } char tmp; - if (read(tty_fd, &tmp, 1) < 0 && errno == EIO) - { + if (read(tty_fd, &tmp, 1) < 0 && errno == EIO) { we_think_we_are_orphaned = true; } close(tty_fd); } - /* Just give up if we've done it a lot times */ - if (loop_count > 4096) - { + // Just give up if we've done it a lot times. + if (loop_count > 4096) { we_think_we_are_orphaned = true; } return we_think_we_are_orphaned; } -/** - Initialize data for interactive use -*/ -static void reader_interactive_init() -{ - /* See if we are running interactively. */ +/// Initialize data for interactive use. +static void reader_interactive_init() { + // See if we are running interactively. pid_t shell_pgid; input_init(); kill_init(); shell_pgid = getpgrp(); - /* - This should enable job control on fish, even if our parent process did - not enable it for us. - */ - - /* - Check if we are in control of the terminal, so that we don't do - semi-expensive things like reset signal handlers unless we - really have to, which we often don't. - */ - if (tcgetpgrp(STDIN_FILENO) != shell_pgid) - { + // This should enable job control on fish, even if our parent process did not enable it for us. + + // Check if we are in control of the terminal, so that we don't do semi-expensive things like + // reset signal handlers unless we really have to, which we often don't. + if (tcgetpgrp(STDIN_FILENO) != shell_pgid) { int block_count = 0; int i; - /* - Bummer, we are not in control of the terminal. Stop until - parent has given us control of it. Stopping in fish is a bit - of a challange, what with all the signal fidgeting, we need - to reset a bunch of signal state, making this coda a but - unobvious. - - In theory, reseting signal handlers could cause us to miss - signal deliveries. In practice, this code should only be run - suring startup, when we're not waiting for any signals. - */ - while (signal_is_blocked()) - { + // Bummer, we are not in control of the terminal. Stop until parent has given us control of + // it. Stopping in fish is a bit of a challange, what with all the signal fidgeting, we need + // to reset a bunch of signal state, making this coda a but unobvious. + // + // In theory, reseting signal handlers could cause us to miss signal deliveries. In + // practice, this code should only be run suring startup, when we're not waiting for any + // signals. + while (signal_is_blocked()) { signal_unblock(); block_count++; } signal_reset_handlers(); - /* Ok, signal handlers are taken out of the picture. Stop ourself in a loop until we are in control of the terminal. However, the call to signal(SIGTTIN) may silently not do anything if we are orphaned. - - As far as I can tell there's no really good way to detect that we are orphaned. One way is to just detect if the group leader exited, via kill(shell_pgid, 0). Another possibility is that read() from the tty fails with EIO - this is more reliable but it's harder, because it may succeed or block. So we loop for a while, trying those strategies. Eventually we just give up and assume we're orphaend. - */ - for (unsigned long loop_count = 0;; loop_count++) - { + // Ok, signal handlers are taken out of the picture. Stop ourself in a loop until we are in + // control of the terminal. However, the call to signal(SIGTTIN) may silently not do + // anything if we are orphaned. + // + // As far as I can tell there's no really good way to detect that we are orphaned. One way + // is to just detect if the group leader exited, via kill(shell_pgid, 0). Another + // possibility is that read() from the tty fails with EIO - this is more reliable but it's + // harder, because it may succeed or block. So we loop for a while, trying those strategies. + // Eventually we just give up and assume we're orphaend. + for (unsigned long loop_count = 0;; loop_count++) { pid_t owner = tcgetpgrp(STDIN_FILENO); shell_pgid = getpgrp(); - if (owner < 0 && errno == ENOTTY) - { + if (owner < 0 && errno == ENOTTY) { // No TTY, cannot be interactive? - debug(1, - _(L"No TTY for interactive shell (tcgetpgrp failed)")); + debug(1, _(L"No TTY for interactive shell (tcgetpgrp failed)")); wperror(L"setpgid"); exit_without_destructors(1); } - if (owner == shell_pgid) - { - /* Success */ - break; - } - else - { - if (check_for_orphaned_process(loop_count, shell_pgid)) - { - /* We're orphaned, so we just die. Another sad statistic. */ - debug(1, - _(L"I appear to be an orphaned process, so I am quitting politely. My pid is %d."), (int)getpid()); + if (owner == shell_pgid) { + break; // success + } else { + if (check_for_orphaned_process(loop_count, shell_pgid)) { + // We're orphaned, so we just die. Another sad statistic. + debug(1, _(L"I appear to be an orphaned process, so I am quitting politely. My " + L"pid is %d."), + (int)getpid()); exit_without_destructors(1); } - /* Try stopping us */ + // Try stopping us. int ret = killpg(shell_pgid, SIGTTIN); - if (ret < 0) - { + if (ret < 0) { wperror(L"killpg"); exit_without_destructors(1); } @@ -2038,40 +1645,31 @@ static void reader_interactive_init() signal_set_handlers(); - for (i=0; i<block_count; i++) - { + for (i = 0; i < block_count; i++) { signal_block(); } - } - - /* Put ourselves in our own process group. */ + // Put ourselves in our own process group. shell_pgid = getpid(); - if (getpgrp() != shell_pgid) - { - if (setpgid(shell_pgid, shell_pgid) < 0) - { - debug(1, - _(L"Couldn't put the shell in its own process group")); + if (getpgrp() != shell_pgid) { + if (setpgid(shell_pgid, shell_pgid) < 0) { + debug(1, _(L"Couldn't put the shell in its own process group")); wperror(L"setpgid"); exit_without_destructors(1); } } - /* Grab control of the terminal. */ - if (tcsetpgrp(STDIN_FILENO, shell_pgid)) - { - debug(1, - _(L"Couldn't grab control of terminal")); + // Grab control of the terminal. + if (tcsetpgrp(STDIN_FILENO, shell_pgid)) { + debug(1, _(L"Couldn't grab control of terminal")); wperror(L"tcsetpgrp"); exit_without_destructors(1); } common_handle_winch(0); - - if (tcsetattr(0,TCSANOW,&shell_modes)) /* set the new modes */ + if (tcsetattr(0, TCSANOW, &shell_modes)) // set the new modes { wperror(L"tcsetattr"); } @@ -2079,40 +1677,26 @@ static void reader_interactive_init() env_set(L"_", L"fish", ENV_GLOBAL); } -/** - Destroy data for interactive use -*/ -static void reader_interactive_destroy() -{ +/// Destroy data for interactive use. +static void reader_interactive_destroy() { kill_destroy(); writestr(L"\n"); set_color(rgb_color_t::reset(), rgb_color_t::reset()); input_destroy(); } - -void reader_sanity_check() -{ - /* Note: 'data' is non-null if we are interactive, except in the testing environment */ - if (get_is_interactive() && data != NULL) - { - if (data->command_line.position > data->command_line.size()) - sanity_lose(); - - if (data->colors.size() != data->command_line.size()) - sanity_lose(); - - if (data->indents.size() != data->command_line.size()) - sanity_lose(); - +void reader_sanity_check() { + // Note: 'data' is non-null if we are interactive, except in the testing environment. + if (get_is_interactive() && data != NULL) { + if (data->command_line.position > data->command_line.size()) sanity_lose(); + if (data->colors.size() != data->command_line.size()) sanity_lose(); + if (data->indents.size() != data->command_line.size()) sanity_lose(); } } -/** - Set the specified string as the current buffer. -*/ -static void set_command_line_and_position(editable_line_t *el, const wcstring &new_str, size_t pos) -{ +/// Set the specified string as the current buffer. +static void set_command_line_and_position(editable_line_t *el, const wcstring &new_str, + size_t pos) { el->text = new_str; update_buff_pos(el, pos); data->command_line_changed(el); @@ -2120,94 +1704,71 @@ static void set_command_line_and_position(editable_line_t *el, const wcstring &n reader_repaint_needed(); } -static void reader_replace_current_token(const wcstring &new_token) -{ - +static void reader_replace_current_token(const wcstring &new_token) { const wchar_t *begin, *end; size_t new_pos; - /* Find current token */ + // Find current token. editable_line_t *el = data->active_edit_line(); const wchar_t *buff = el->text.c_str(); parse_util_token_extent(buff, el->position, &begin, &end, 0, 0); - if (!begin || !end) - return; + if (!begin || !end) return; - /* Make new string */ + // Make new string. wcstring new_buff(buff, begin - buff); new_buff.append(new_token); new_buff.append(end); - new_pos = (begin-buff) + new_token.size(); + new_pos = (begin - buff) + new_token.size(); set_command_line_and_position(el, new_buff, new_pos); } - -/** - Reset the data structures associated with the token search -*/ -static void reset_token_history() -{ +/// Reset the data structures associated with the token search. +static void reset_token_history() { const editable_line_t *el = data->active_edit_line(); const wchar_t *begin, *end; const wchar_t *buff = el->text.c_str(); parse_util_token_extent((wchar_t *)buff, el->position, &begin, &end, 0, 0); data->search_buff.clear(); - if (begin) - { + if (begin) { data->search_buff.append(begin, end - begin); } data->token_history_pos = -1; - data->search_pos=0; + data->search_pos = 0; data->search_prev.clear(); data->search_prev.push_back(data->search_buff); - data->history_search = history_search_t(*data->history, data->search_buff, HISTORY_SEARCH_TYPE_CONTAINS); + data->history_search = + history_search_t(*data->history, data->search_buff, HISTORY_SEARCH_TYPE_CONTAINS); } - -/** - Handles a token search command. - - \param forward if the search should be forward or reverse - \param reset whether the current token should be made the new search token -*/ -static void handle_token_history(int forward, int reset) -{ - /* Paranoia */ - if (! data) - return; +/// Handles a token search command. +/// +/// \param forward if the search should be forward or reverse +/// \param reset whether the current token should be made the new search token +static void handle_token_history(int forward, int reset) { + if (!data) return; wcstring str; size_t current_pos; - if (reset) - { - /* - Start a new token search using the current token - */ + if (reset) { + // Start a new token search using the current token. reset_token_history(); - } + current_pos = data->token_history_pos; - current_pos = data->token_history_pos; - - if (forward || data->search_pos + 1 < data->search_prev.size()) - { - if (forward) - { - if (data->search_pos > 0) - { + if (forward || data->search_pos + 1 < data->search_prev.size()) { + if (forward) { + if (data->search_pos > 0) { data->search_pos--; } str = data->search_prev.at(data->search_pos); - } - else - { + } else { data->search_pos++; str = data->search_prev.at(data->search_pos); } @@ -2215,192 +1776,139 @@ static void handle_token_history(int forward, int reset) reader_replace_current_token(str); reader_super_highlight_me_plenty(); reader_repaint(); - } - else - { - if (current_pos == size_t(-1)) - { + } else { + if (current_pos == size_t(-1)) { data->token_history_buff.clear(); - /* - Search for previous item that contains this substring - */ - if (data->history_search.go_backwards()) - { + // Search for previous item that contains this substring. + if (data->history_search.go_backwards()) { data->token_history_buff = data->history_search.current_string(); } current_pos = data->token_history_buff.size(); - } - if (data->token_history_buff.empty()) - { - /* - We have reached the end of the history - check if the - history already contains the search string itself, if so - return, otherwise add it. - */ - + if (data->token_history_buff.empty()) { + // We have reached the end of the history - check if the history already contains the + // search string itself, if so return, otherwise add it. const wcstring &last = data->search_prev.back(); - if (data->search_buff != last) - { + if (data->search_buff != last) { str = data->search_buff; - } - else - { + } else { return; } - } - else - { - - //debug( 3, L"new '%ls'", data->token_history_buff.c_str() ); + } else { + // debug( 3, L"new '%ls'", data->token_history_buff.c_str() ); tokenizer_t tok(data->token_history_buff.c_str(), TOK_ACCEPT_UNFINISHED); tok_t token; - while (tok.next(&token)) - { - switch (token.type) - { - case TOK_STRING: - { - if (token.text.find(data->search_buff) != wcstring::npos) - { - //debug( 3, L"Found token at pos %d\n", tok_get_pos( &tok ) ); - if (token.offset >= current_pos) - { + while (tok.next(&token)) { + switch (token.type) { + case TOK_STRING: { + if (token.text.find(data->search_buff) != wcstring::npos) { + // debug( 3, L"Found token at pos %d\n", tok_get_pos( &tok ) ); + if (token.offset >= current_pos) { break; } - //debug( 3, L"ok pos" ); + // debug( 3, L"ok pos" ); - if (find(data->search_prev.begin(), data->search_prev.end(), token.text) == data->search_prev.end()) - { + if (find(data->search_prev.begin(), data->search_prev.end(), + token.text) == data->search_prev.end()) { data->token_history_pos = token.offset; str = token.text; } - } - } - break; - - default: - { break; } - + default: { break; } } } } - if (!str.empty()) - { + if (!str.empty()) { reader_replace_current_token(str); reader_super_highlight_me_plenty(); reader_repaint(); data->search_pos = data->search_prev.size(); data->search_prev.push_back(str); - } - else if (! reader_interrupted()) - { - data->token_history_pos=-1; + } else if (!reader_interrupted()) { + data->token_history_pos = -1; handle_token_history(0, 0); } } } -/** - Move buffer position one word or erase one word. This function - updates both the internal buffer and the screen. It is used by - M-left, M-right and ^W to do block movement or block erase. - - \param dir Direction to move/erase. 0 means move left, 1 means move right. - \param erase Whether to erase the characters along the way or only move past them. - \param new if the new kill item should be appended to the previous kill item or not. -*/ -enum move_word_dir_t -{ - MOVE_DIR_LEFT, - MOVE_DIR_RIGHT -}; +/// Move buffer position one word or erase one word. This function updates both the internal buffer +/// and the screen. It is used by M-left, M-right and ^W to do block movement or block erase. +/// +/// \param dir Direction to move/erase. 0 means move left, 1 means move right. +/// \param erase Whether to erase the characters along the way or only move past them. +/// \param new if the new kill item should be appended to the previous kill item or not. +enum move_word_dir_t { MOVE_DIR_LEFT, MOVE_DIR_RIGHT }; -static void move_word(editable_line_t *el, bool move_right, bool erase, enum move_word_style_t style, bool newv) -{ - /* Return if we are already at the edge */ +static void move_word(editable_line_t *el, bool move_right, bool erase, + enum move_word_style_t style, bool newv) { + // Return if we are already at the edge. const size_t boundary = move_right ? el->size() : 0; - if (el->position == boundary) - return; + if (el->position == boundary) return; - /* When moving left, a value of 1 means the character at index 0. */ + // When moving left, a value of 1 means the character at index 0. move_word_state_machine_t state(style); - const wchar_t * const command_line = el->text.c_str(); + const wchar_t *const command_line = el->text.c_str(); const size_t start_buff_pos = el->position; size_t buff_pos = el->position; - while (buff_pos != boundary) - { + while (buff_pos != boundary) { size_t idx = (move_right ? buff_pos : buff_pos - 1); wchar_t c = command_line[idx]; - if (! state.consume_char(c)) - break; + if (!state.consume_char(c)) break; buff_pos = (move_right ? buff_pos + 1 : buff_pos - 1); } - /* Always consume at least one character */ - if (buff_pos == start_buff_pos) - buff_pos = (move_right ? buff_pos + 1 : buff_pos - 1); + // Always consume at least one character. + if (buff_pos == start_buff_pos) buff_pos = (move_right ? buff_pos + 1 : buff_pos - 1); - /* If we are moving left, buff_pos-1 is the index of the first character we do not delete (possibly -1). If we are moving right, then buff_pos is that index - possibly el->size(). */ - if (erase) - { - /* Don't autosuggest after a kill */ - if (el == &data->command_line) - { + // If we are moving left, buff_pos-1 is the index of the first character we do not delete + // (possibly -1). If we are moving right, then buff_pos is that index - possibly el->size(). + if (erase) { + // Don't autosuggest after a kill. + if (el == &data->command_line) { data->suppress_autosuggestion = true; } - if (move_right) - { + if (move_right) { reader_kill(el, start_buff_pos, buff_pos - start_buff_pos, KILL_APPEND, newv); - } - else - { + } else { reader_kill(el, buff_pos, start_buff_pos - buff_pos, KILL_PREPEND, newv); } - } - else - { + } else { update_buff_pos(el, buff_pos); reader_repaint(); } - } -const wchar_t *reader_get_buffer(void) -{ +const wchar_t *reader_get_buffer(void) { ASSERT_IS_MAIN_THREAD(); return data ? data->command_line.text.c_str() : NULL; } -history_t *reader_get_history(void) -{ +history_t *reader_get_history(void) { ASSERT_IS_MAIN_THREAD(); return data ? data->history : NULL; } -/* Sets the command line contents, without clearing the pager */ -static void reader_set_buffer_maintaining_pager(const wcstring &b, size_t pos) -{ - /* Callers like to pass us pointers into ourselves, so be careful! I don't know if we can use operator= with a pointer to our interior, so use an intermediate. */ +/// Sets the command line contents, without clearing the pager. +static void reader_set_buffer_maintaining_pager(const wcstring &b, size_t pos) { + // Callers like to pass us pointers into ourselves, so be careful! I don't know if we can use + // operator= with a pointer to our interior, so use an intermediate. size_t command_line_len = b.size(); data->command_line.text = b; data->command_line_changed(&data->command_line); - /* Don't set a position past the command line length */ - if (pos > command_line_len) - pos = command_line_len; + // Don't set a position past the command line length. + if (pos > command_line_len) pos = command_line_len; update_buff_pos(&data->command_line, pos); - /* Clear history search and pager contents */ + // Clear history search and pager contents. data->search_mode = NO_SEARCH; data->search_buff.clear(); data->history_search.go_to_end(); @@ -2409,30 +1917,23 @@ static void reader_set_buffer_maintaining_pager(const wcstring &b, size_t pos) reader_repaint_needed(); } -/* Sets the command line contents, clearing the pager */ -void reader_set_buffer(const wcstring &b, size_t pos) -{ - if (!data) - return; +/// Sets the command line contents, clearing the pager. +void reader_set_buffer(const wcstring &b, size_t pos) { + if (!data) return; clear_pager(); reader_set_buffer_maintaining_pager(b, pos); } - -size_t reader_get_cursor_pos() -{ - if (!data) - return (size_t)(-1); +size_t reader_get_cursor_pos() { + if (!data) return (size_t)(-1); return data->command_line.position; } -bool reader_get_selection(size_t *start, size_t *len) -{ +bool reader_get_selection(size_t *start, size_t *len) { bool result = false; - if (data != NULL && data->sel_active) - { + if (data != NULL && data->sel_active) { *start = data->sel_start_pos; *len = std::min(data->sel_stop_pos - data->sel_start_pos + 1, data->command_line.size()); result = true; @@ -2440,17 +1941,14 @@ bool reader_get_selection(size_t *start, size_t *len) return result; } - #define ENV_CMD_DURATION L"CMD_DURATION" -void set_env_cmd_duration(struct timeval *after, struct timeval *before) -{ +void set_env_cmd_duration(struct timeval *after, struct timeval *before) { time_t secs = after->tv_sec - before->tv_sec; suseconds_t usecs = after->tv_usec - before->tv_usec; wchar_t buf[16]; - if (after->tv_usec < before->tv_usec) - { + if (after->tv_usec < before->tv_usec) { usecs += 1000000; secs -= 1; } @@ -2459,15 +1957,12 @@ void set_env_cmd_duration(struct timeval *after, struct timeval *before) env_set(ENV_CMD_DURATION, buf, ENV_UNEXPORT); } -void reader_run_command(parser_t &parser, const wcstring &cmd) -{ - +void reader_run_command(parser_t &parser, const wcstring &cmd) { struct timeval time_before, time_after; wcstring ft = tok_first(cmd); - if (! ft.empty()) - env_set(L"_", ft.c_str(), ENV_GLOBAL); + if (!ft.empty()) env_set(L"_", ft.c_str(), ENV_GLOBAL); reader_write_title(cmd); @@ -2488,30 +1983,26 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) #ifdef HAVE__PROC_SELF_STAT proc_update_jiffies(); #endif - - } - -parser_test_error_bits_t reader_shell_test(const wchar_t *b) -{ +parser_test_error_bits_t reader_shell_test(const wchar_t *b) { assert(b != NULL); wcstring bstr = b; - /* Append a newline, to act as a statement terminator */ + // Append a newline, to act as a statement terminator. bstr.push_back(L'\n'); parse_error_list_t errors; - parser_test_error_bits_t res = parse_util_detect_errors(bstr, &errors, true /* do accept incomplete */); + parser_test_error_bits_t res = + parse_util_detect_errors(bstr, &errors, true /* do accept incomplete */); - if (res & PARSER_TEST_ERROR) - { + if (res & PARSER_TEST_ERROR) { wcstring error_desc; parser_t::principal_parser().get_backtrace(bstr, errors, &error_desc); - // ensure we end with a newline. Also add an initial newline, because it's likely the user just hit enter and so there's junk on the current line - if (! string_suffixes_string(L"\n", error_desc)) - { + // Ensure we end with a newline. Also add an initial newline, because it's likely the user + // just hit enter and so there's junk on the current line. + if (!string_suffixes_string(L"\n", error_desc)) { error_desc.push_back(L'\n'); } fwprintf(stderr, L"\n%ls", error_desc.c_str()); @@ -2519,30 +2010,22 @@ parser_test_error_bits_t reader_shell_test(const wchar_t *b) return res; } -/** - Test if the given string contains error. Since this is the error - detection for general purpose, there are no invalid strings, so - this function always returns false. -*/ -static parser_test_error_bits_t default_test(const wchar_t *b) -{ - return 0; -} +/// Test if the given string contains error. Since this is the error detection for general purpose, +/// there are no invalid strings, so this function always returns false. +static parser_test_error_bits_t default_test(const wchar_t *b) { return 0; } -void reader_push(const wchar_t *name) -{ +void reader_push(const wchar_t *name) { reader_data_t *n = new reader_data_t(); - n->history = & history_t::history_with_name(name); + n->history = &history_t::history_with_name(name); n->app_name = name; n->next = data; - data=n; + data = n; data->command_line_changed(&data->command_line); - if (data->next == 0) - { + if (data->next == 0) { reader_interactive_init(); } @@ -2552,178 +2035,132 @@ void reader_push(const wchar_t *name) reader_set_left_prompt(L""); } -void reader_pop() -{ +void reader_pop() { reader_data_t *n = data; - if (data == 0) - { + if (data == 0) { debug(0, _(L"Pop null reader block")); sanity_lose(); return; } - data=data->next; + data = data->next; - /* Invoke the destructor to balance our new */ + // Invoke the destructor to balance our new. delete n; - if (data == 0) - { + if (data == 0) { reader_interactive_destroy(); - } - else - { + } else { end_loop = 0; - //history_set_mode( data->app_name.c_str() ); + // history_set_mode( data->app_name.c_str() ); s_reset(&data->screen, screen_reset_abandon_line); } } -void reader_set_left_prompt(const wcstring &new_prompt) -{ - data->left_prompt = new_prompt; -} +void reader_set_left_prompt(const wcstring &new_prompt) { data->left_prompt = new_prompt; } -void reader_set_right_prompt(const wcstring &new_prompt) -{ - data->right_prompt = new_prompt; -} +void reader_set_right_prompt(const wcstring &new_prompt) { data->right_prompt = new_prompt; } -void reader_set_allow_autosuggesting(bool flag) -{ - data->allow_autosuggestion = flag; -} +void reader_set_allow_autosuggesting(bool flag) { data->allow_autosuggestion = flag; } -void reader_set_expand_abbreviations(bool flag) -{ - data->expand_abbreviations = flag; -} +void reader_set_expand_abbreviations(bool flag) { data->expand_abbreviations = flag; } -void reader_set_complete_function(complete_function_t f) -{ - data->complete_func = f; -} +void reader_set_complete_function(complete_function_t f) { data->complete_func = f; } -void reader_set_highlight_function(highlight_function_t func) -{ - data->highlight_function = func; -} +void reader_set_highlight_function(highlight_function_t func) { data->highlight_function = func; } -void reader_set_test_function(parser_test_error_bits_t (*f)(const wchar_t *)) -{ +void reader_set_test_function(parser_test_error_bits_t (*f)(const wchar_t *)) { data->test_func = f; } -void reader_set_exit_on_interrupt(bool i) -{ - data->exit_on_interrupt = i; -} +void reader_set_exit_on_interrupt(bool i) { data->exit_on_interrupt = i; } -void reader_import_history_if_necessary(void) -{ - /* Import history from older location (config path) if our current history is empty */ - if (data->history && data->history->is_empty()) - { +void reader_import_history_if_necessary(void) { + // Import history from older location (config path) if our current history is empty. + if (data->history && data->history->is_empty()) { data->history->populate_from_config_path(); } - /* Import history from bash, etc. if our current history is still empty */ - if (data->history && data->history->is_empty()) - { - /* Try opening a bash file. We make an effort to respect $HISTFILE; this isn't very complete (AFAIK it doesn't have to be exported), and to really get this right we ought to ask bash itself. But this is better than nothing. - */ + // Import history from bash, etc. if our current history is still empty. + if (data->history && data->history->is_empty()) { + // Try opening a bash file. We make an effort to respect $HISTFILE; this isn't very complete + // (AFAIK it doesn't have to be exported), and to really get this right we ought to ask bash + // itself. But this is better than nothing. const env_var_t var = env_get_string(L"HISTFILE"); wcstring path = (var.missing() ? L"~/.bash_history" : var); expand_tilde(path); FILE *f = wfopen(path, "r"); - if (f) - { + if (f) { data->history->populate_from_bash(f); fclose(f); } } } -/** A class as the context pointer for a background (threaded) highlight operation. */ -class background_highlight_context_t -{ -public: - /** The string to highlight */ +/// A class as the context pointer for a background (threaded) highlight operation. +class background_highlight_context_t { + public: + /// The string to highlight. const wcstring string_to_highlight; - - /** Color buffer */ + /// Color buffer. std::vector<highlight_spec_t> colors; - - /** The position to use for bracket matching */ + /// The position to use for bracket matching. const size_t match_highlight_pos; - - /** Function for syntax highlighting */ + /// Function for syntax highlighting. const highlight_function_t highlight_function; - - /** Environment variables */ + /// Environment variables. const env_vars_snapshot_t vars; - - /** When the request was made */ + /// When the request was made. const double when; - - /** Gen count at the time the request was made */ + /// Gen count at the time the request was made. const unsigned int generation_count; - background_highlight_context_t(const wcstring &pbuff, size_t phighlight_pos, highlight_function_t phighlight_func) : - string_to_highlight(pbuff), - colors(pbuff.size(), 0), - match_highlight_pos(phighlight_pos), - highlight_function(phighlight_func), - vars(env_vars_snapshot_t::highlighting_keys), - when(timef()), - generation_count(s_generation_count) - { - } - - int perform_highlight() - { - if (generation_count != s_generation_count) - { - // The gen count has changed, so don't do anything + background_highlight_context_t(const wcstring &pbuff, size_t phighlight_pos, + highlight_function_t phighlight_func) + : string_to_highlight(pbuff), + colors(pbuff.size(), 0), + match_highlight_pos(phighlight_pos), + highlight_function(phighlight_func), + vars(env_vars_snapshot_t::highlighting_keys), + when(timef()), + generation_count(s_generation_count) {} + + int perform_highlight() { + if (generation_count != s_generation_count) { + // The gen count has changed, so don't do anything. return 0; } - if (! string_to_highlight.empty()) - { - highlight_function(string_to_highlight, colors, match_highlight_pos, NULL /* error */, vars); + if (!string_to_highlight.empty()) { + highlight_function(string_to_highlight, colors, match_highlight_pos, NULL /* error */, + vars); } return 0; } }; -/* Called to set the highlight flag for search results */ -static void highlight_search(void) -{ - if (! data->search_buff.empty() && ! data->history_search.is_at_end()) - { +/// Called to set the highlight flag for search results. +static void highlight_search(void) { + if (!data->search_buff.empty() && !data->history_search.is_at_end()) { const editable_line_t *el = &data->command_line; const wcstring &needle = data->search_buff; size_t match_pos = el->text.find(needle); - if (match_pos != wcstring::npos) - { + if (match_pos != wcstring::npos) { size_t end = match_pos + needle.size(); - for (size_t i=match_pos; i < end; i++) - { - data->colors.at(i) |= (highlight_spec_search_match<<16); + for (size_t i = match_pos; i < end; i++) { + data->colors.at(i) |= (highlight_spec_search_match << 16); } } } } -static void highlight_complete(background_highlight_context_t *ctx, int result) -{ +static void highlight_complete(background_highlight_context_t *ctx, int result) { ASSERT_IS_MAIN_THREAD(); - if (ctx->string_to_highlight == data->command_line.text) - { - /* The data hasn't changed, so swap in our colors. The colors may not have changed, so do nothing if they have not. */ + if (ctx->string_to_highlight == data->command_line.text) { + // The data hasn't changed, so swap in our colors. The colors may not have changed, so do + // nothing if they have not. assert(ctx->colors.size() == data->command_line.size()); - if (data->colors != ctx->colors) - { + if (data->colors != ctx->colors) { data->colors.swap(ctx->colors); sanity_check(); highlight_search(); @@ -2731,28 +2168,24 @@ static void highlight_complete(background_highlight_context_t *ctx, int result) } } - /* Free our context */ delete ctx; } -static int threaded_highlight(background_highlight_context_t *ctx) -{ +static int threaded_highlight(background_highlight_context_t *ctx) { return ctx->perform_highlight(); } - -/** - Call specified external highlighting function and then do search - highlighting. Lastly, clear the background color under the cursor - to avoid repaint issues on terminals where e.g. syntax highlighting - maykes characters under the sursor unreadable. - - \param match_highlight_pos_adjust the adjustment to the position to use for bracket matching. This is added to the current cursor position and may be negative. - \param error if non-null, any possible errors in the buffer are further descibed by the strings inserted into the specified arraylist - \param no_io if true, do a highlight that does not perform I/O, synchronously. If false, perform an asynchronous highlight in the background, which may perform disk I/O. -*/ -static void reader_super_highlight_me_plenty(int match_highlight_pos_adjust, bool no_io) -{ +/// Call specified external highlighting function and then do search highlighting. Lastly, clear the +/// background color under the cursor to avoid repaint issues on terminals where e.g. syntax +/// highlighting maykes characters under the sursor unreadable. +/// +/// \param match_highlight_pos_adjust the adjustment to the position to use for bracket matching. +/// This is added to the current cursor position and may be negative. +/// \param error if non-null, any possible errors in the buffer are further descibed by the strings +/// inserted into the specified arraylist +/// \param no_io if true, do a highlight that does not perform I/O, synchronously. If false, perform +/// an asynchronous highlight in the background, which may perform disk I/O. +static void reader_super_highlight_me_plenty(int match_highlight_pos_adjust, bool no_io) { const editable_line_t *el = &data->command_line; long match_highlight_pos = (long)el->position + match_highlight_pos_adjust; assert(match_highlight_pos >= 0); @@ -2760,103 +2193,77 @@ static void reader_super_highlight_me_plenty(int match_highlight_pos_adjust, boo reader_sanity_check(); highlight_function_t highlight_func = no_io ? highlight_shell_no_io : data->highlight_function; - background_highlight_context_t *ctx = new background_highlight_context_t(el->text, match_highlight_pos, highlight_func); - if (no_io) - { - // Highlighting without IO, we just do it - // Note that highlight_complete deletes ctx. + background_highlight_context_t *ctx = + new background_highlight_context_t(el->text, match_highlight_pos, highlight_func); + if (no_io) { + // Highlighting without IO, we just do it. Note that highlight_complete deletes ctx. int result = ctx->perform_highlight(); highlight_complete(ctx, result); - } - else - { - // Highlighting including I/O proceeds in the background + } else { + // Highlighting including I/O proceeds in the background. iothread_perform(threaded_highlight, highlight_complete, ctx); } highlight_search(); - /* Here's a hack. Check to see if our autosuggestion still applies; if so, don't recompute it. Since the autosuggestion computation is asynchronous, this avoids "flashing" as you type into the autosuggestion. */ + // Here's a hack. Check to see if our autosuggestion still applies; if so, don't recompute it. + // Since the autosuggestion computation is asynchronous, this avoids "flashing" as you type into + // the autosuggestion. const wcstring &cmd = el->text, &suggest = data->autosuggestion; - if (can_autosuggest() && ! suggest.empty() && string_prefixes_string_case_insensitive(cmd, suggest)) - { - /* The autosuggestion is still reasonable, so do nothing */ - } - else - { + if (can_autosuggest() && !suggest.empty() && + string_prefixes_string_case_insensitive(cmd, suggest)) { + // The autosuggestion is still reasonable, so do nothing. + } else { update_autosuggestion(); } } - -bool shell_is_exiting() -{ +bool shell_is_exiting() { if (get_is_interactive()) return job_list_is_empty() && data != NULL && data->end_loop; else return end_loop; } -/** - This function is called when the main loop notices that end_loop - has been set while in interactive mode. It checks if it is ok to - exit. - */ - -static void handle_end_loop() -{ +/// This function is called when the main loop notices that end_loop has been set while in +/// interactive mode. It checks if it is ok to exit. +static void handle_end_loop() { job_t *j; - int stopped_jobs_count=0; - int is_breakpoint=0; + int stopped_jobs_count = 0; + int is_breakpoint = 0; const parser_t &parser = parser_t::principal_parser(); - for (size_t i = 0; i < parser.block_count(); i++) - { - if (parser.block_at_index(i)->type() == BREAKPOINT) - { + for (size_t i = 0; i < parser.block_count(); i++) { + if (parser.block_at_index(i)->type() == BREAKPOINT) { is_breakpoint = 1; break; } } job_iterator_t jobs; - while ((j = jobs.next())) - { - if (!job_is_completed(j) && (job_is_stopped(j))) - { + while ((j = jobs.next())) { + if (!job_is_completed(j) && (job_is_stopped(j))) { stopped_jobs_count++; break; } } - if (!reader_exit_forced() && !data->prev_end_loop && stopped_jobs_count && !is_breakpoint) - { - writestr(_(L"There are stopped jobs. A second attempt to exit will enforce their termination.\n")); + if (!reader_exit_forced() && !data->prev_end_loop && stopped_jobs_count && !is_breakpoint) { + writestr(_( + L"There are stopped jobs. A second attempt to exit will enforce their termination.\n")); reader_exit(0, 0); - data->prev_end_loop=1; - } - else - { - /* PCA: we used to only hangup jobs if stdin was closed. This prevented child processes from exiting. It's unclear to my why it matters if stdin is closed, but it seems to me if we're forcing an exit, we definitely want to hang up our processes. - - See https://github.com/fish-shell/fish-shell/issues/138 - */ - if (reader_exit_forced() || !isatty(0)) - { - /* - We already know that stdin is a tty since we're - in interactive mode. If isatty returns false, it - means stdin must have been closed. - */ + data->prev_end_loop = 1; + } else { + // PCA: We used to only hangup jobs if stdin was closed. This prevented child processes from + // exiting. It's unclear to my why it matters if stdin is closed, but it seems to me if + // we're forcing an exit, we definitely want to hang up our processes. See issue #138. + if (reader_exit_forced() || !isatty(0)) { + // We already know that stdin is a tty since we're in interactive mode. If isatty + // returns false, it means stdin must have been closed. job_iterator_t jobs; - while ((j = jobs.next())) - { - /* Send SIGHUP only to foreground processes. - - See https://github.com/fish-shell/fish-shell/issues/1771 - */ - if (! job_is_completed(j) && job_get_flag(j, JOB_FOREGROUND)) - { + while ((j = jobs.next())) { + // Send SIGHUP only to foreground processes. See issue #1771. + if (!job_is_completed(j) && job_get_flag(j, JOB_FOREGROUND)) { job_signal(j, SIGHUP); } } @@ -2864,27 +2271,19 @@ static void handle_end_loop() } } -static bool selection_is_at_top() -{ +static bool selection_is_at_top() { const pager_t *pager = &data->pager; size_t row = pager->get_selected_row(data->current_page_rendering); - if (row != 0 && row != PAGER_SELECTION_NONE) - return false; + if (row != 0 && row != PAGER_SELECTION_NONE) return false; size_t col = pager->get_selected_column(data->current_page_rendering); - if (col != 0 && col != PAGER_SELECTION_NONE) - return false; + if (col != 0 && col != PAGER_SELECTION_NONE) return false; return true; } - -/** - Read interactively. Read input from stdin while providing editing - facilities. -*/ -static int read_i(void) -{ +/// Read interactively. Read input from stdin while providing editing facilities. +static int read_i(void) { reader_push(L"fish"); reader_set_complete_function(&complete); reader_set_highlight_function(&highlight_shell); @@ -2895,10 +2294,9 @@ static int read_i(void) parser_t &parser = parser_t::principal_parser(); - data->prev_end_loop=0; + data->prev_end_loop = 0; - while ((!data->end_loop) && (!sanity_check())) - { + while ((!data->end_loop) && (!sanity_check())) { event_fire_generic(L"fish_prompt"); if (function_exists(LEFT_PROMPT_FUNCTION_NAME)) reader_set_left_prompt(LEFT_PROMPT_FUNCTION_NAME); @@ -2910,21 +2308,13 @@ static int read_i(void) else reader_set_right_prompt(L""); - - /* - Put buff in temporary string and clear buff, so - that we can handle a call to reader_set_buffer - during evaluation. - */ - + // Put buff in temporary string and clear buff, so that we can handle a call to + // reader_set_buffer during evaluation. const wchar_t *tmp = reader_readline(0); - if (data->end_loop) - { + if (data->end_loop) { handle_end_loop(); - } - else if (tmp) - { + } else if (tmp) { const wcstring command = tmp; update_buff_pos(&data->command_line, 0); data->command_line.text.clear(); @@ -2933,34 +2323,24 @@ static int read_i(void) event_fire_generic(L"fish_preexec", &argv); reader_run_command(parser, command); event_fire_generic(L"fish_postexec", &argv); - /* Allow any pending history items to be returned in the history array. */ - if (data->history) - { + // Allow any pending history items to be returned in the history array. + if (data->history) { data->history->resolve_pending(); } - if (data->end_loop) - { + if (data->end_loop) { handle_end_loop(); - } - else - { - data->prev_end_loop=0; + } else { + data->prev_end_loop = 0; } } - - } reader_pop(); return 0; } -/** - Test if there are bytes available for reading on the specified file - descriptor -*/ -static int can_read(int fd) -{ - struct timeval can_read_timeout = { 0, 0 }; +/// Test if there are bytes available for reading on the specified file descriptor. +static int can_read(int fd) { + struct timeval can_read_timeout = {0, 0}; fd_set fds; FD_ZERO(&fds); @@ -2968,85 +2348,71 @@ static int can_read(int fd) return select(fd + 1, &fds, 0, 0, &can_read_timeout) == 1; } -// Test if the specified character is in a range that fish uses interally to -// store special tokens. +// Test if the specified character is in a range that fish uses interally to store special tokens. // -// NOTE: This is used when tokenizing the input. It is also used when reading -// input, before tokenization, to replace such chars with REPLACEMENT_WCHAR if -// they're not part of a quoted string. We don't want external input to be able -// to feed reserved characters into our lexer/parser or code evaluator. +// NOTE: This is used when tokenizing the input. It is also used when reading input, before +// tokenization, to replace such chars with REPLACEMENT_WCHAR if they're not part of a quoted +// string. We don't want external input to be able to feed reserved characters into our lexer/parser +// or code evaluator. // // TODO: Actually implement the replacement as documented above. -static int wchar_private(wchar_t c) -{ +static int wchar_private(wchar_t c) { return ((c >= RESERVED_CHAR_BASE && c < RESERVED_CHAR_END) || (c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END) || (c >= INPUT_COMMON_BASE && c < INPUT_COMMON_END)); } -/** - Test if the specified character in the specified string is - backslashed. pos may be at the end of the string, which indicates - if there is a trailing backslash. -*/ -static bool is_backslashed(const wcstring &str, size_t pos) -{ - /* note pos == str.size() is OK */ - if (pos > str.size()) - return false; +/// Test if the specified character in the specified string is backslashed. pos may be at the end of +/// the string, which indicates if there is a trailing backslash. +static bool is_backslashed(const wcstring &str, size_t pos) { + // note pos == str.size() is OK. + if (pos > str.size()) return false; size_t count = 0, idx = pos; - while (idx--) - { - if (str.at(idx) != L'\\') - break; + while (idx--) { + if (str.at(idx) != L'\\') break; count++; } return (count % 2) == 1; } -static wchar_t unescaped_quote(const wcstring &str, size_t pos) -{ +static wchar_t unescaped_quote(const wcstring &str, size_t pos) { wchar_t result = L'\0'; - if (pos < str.size()) - { + if (pos < str.size()) { wchar_t c = str.at(pos); - if ((c == L'\'' || c == L'"') && ! is_backslashed(str, pos)) - { + if ((c == L'\'' || c == L'"') && !is_backslashed(str, pos)) { result = c; } } return result; } -/* Returns true if the last token is a comment. */ -static bool text_ends_in_comment(const wcstring &text) -{ +/// Returns true if the last token is a comment. +static bool text_ends_in_comment(const wcstring &text) { tokenizer_t tok(text.c_str(), TOK_ACCEPT_UNFINISHED | TOK_SHOW_COMMENTS | TOK_SQUASH_ERRORS); tok_t token; - while (tok.next(&token)) - { + while (tok.next(&token)) { // pass } return token.type == TOK_COMMENT; } -const wchar_t *reader_readline(int nchars) -{ +const wchar_t *reader_readline(int nchars) { wint_t c; - int last_char=0; - size_t yank_len=0; + int last_char = 0; + size_t yank_len = 0; const wchar_t *yank_str; bool comp_empty = true; std::vector<completion_t> comp; - int finished=0; + int finished = 0; struct termios old_modes; - /* Coalesce redundant repaints. When we get a repaint, we set this to true, and skip repaints until we get something else. */ + // Coalesce redundant repaints. When we get a repaint, we set this to true, and skip repaints + // until we get something else. bool coalescing_repaints = false; - /* The command line before completion */ + // The command line before completion. data->cycle_command_line.clear(); data->cycle_cursor_pos = 0; @@ -3059,188 +2425,139 @@ const wchar_t *reader_readline(int nchars) s_reset(&data->screen, screen_reset_abandon_line); reader_repaint(); - /* - get the current terminal modes. These will be restored when the - function returns. - */ - tcgetattr(0,&old_modes); - /* set the new modes */ - if (tcsetattr(0,TCSANOW,&shell_modes)) - { + // Get the current terminal modes. These will be restored when the function returns. + tcgetattr(0, &old_modes); + // Set the new modes. + if (tcsetattr(0, TCSANOW, &shell_modes)) { wperror(L"tcsetattr"); } - while (!finished && !data->end_loop) - { - if (0 < nchars && (size_t)nchars <= data->command_line.size()) - { - // we've already hit the specified character limit + while (!finished && !data->end_loop) { + if (0 < nchars && (size_t)nchars <= data->command_line.size()) { + // We've already hit the specified character limit. finished = 1; break; } - /* - Sometimes strange input sequences seem to generate a zero - byte. I believe these simply mean a character was pressed - but it should be ignored. (Example: Trying to add a tilde - (~) to digit) - */ - while (1) - { + // Sometimes strange input sequences seem to generate a zero byte. I believe these simply + // mean a character was pressed but it should be ignored. (Example: Trying to add a tilde + // (~) to digit). + while (1) { int was_interactive_read = is_interactive_read; is_interactive_read = 1; - c=input_readch(); + c = input_readch(); is_interactive_read = was_interactive_read; - //fprintf(stderr, "C: %lx\n", (long)c); - - if (((!wchar_private(c))) && (c>31) && (c != 127)) - { - if (can_read(0)) - { + // fprintf(stderr, "C: %lx\n", (long)c); - wchar_t arr[READAHEAD_MAX+1]; + if (((!wchar_private(c))) && (c > 31) && (c != 127)) { + if (can_read(0)) { + wchar_t arr[READAHEAD_MAX + 1]; size_t i; - size_t limit = 0 < nchars ? std::min((size_t)nchars - data->command_line.size(), (size_t)READAHEAD_MAX) + size_t limit = 0 < nchars ? std::min((size_t)nchars - data->command_line.size(), + (size_t)READAHEAD_MAX) : READAHEAD_MAX; memset(arr, 0, sizeof(arr)); arr[0] = c; - for (i = 1; i < limit; ++i) - { - - if (!can_read(0)) - { + for (i = 1; i < limit; ++i) { + if (!can_read(0)) { c = 0; break; } - // only allow commands on the first key; otherwise, we might - // have data we need to insert on the commandline that the - // commmand might need to be able to see. + // Only allow commands on the first key; otherwise, we might have data we + // need to insert on the commandline that the commmand might need to be able + // to see. c = input_readch(false); - if ((!wchar_private(c)) && (c>31) && (c != 127)) - { - arr[i]=c; - c=0; - } - else + if ((!wchar_private(c)) && (c > 31) && (c != 127)) { + arr[i] = c; + c = 0; + } else break; } editable_line_t *el = data->active_edit_line(); insert_string(el, arr, true); - /* End paging upon inserting into the normal command line */ - if (el == &data->command_line) - { + // End paging upon inserting into the normal command line. + if (el == &data->command_line) { clear_pager(); } last_char = c; } } - if (c != 0) - break; + if (c != 0) break; - if (0 < nchars && (size_t)nchars <= data->command_line.size()) - { + if (0 < nchars && (size_t)nchars <= data->command_line.size()) { c = R_NULL; break; } } - /* If we get something other than a repaint, then stop coalescing them */ - if (c != R_REPAINT) - coalescing_repaints = false; + // If we get something other than a repaint, then stop coalescing them. + if (c != R_REPAINT) coalescing_repaints = false; - if (last_char != R_YANK && last_char != R_YANK_POP) - yank_len=0; + if (last_char != R_YANK && last_char != R_YANK_POP) yank_len = 0; - /* Restore the text */ - if (c == R_CANCEL && data->is_navigating_pager_contents()) - { - set_command_line_and_position(&data->command_line, data->cycle_command_line, data->cycle_cursor_pos); + // Restore the text. + if (c == R_CANCEL && data->is_navigating_pager_contents()) { + set_command_line_and_position(&data->command_line, data->cycle_command_line, + data->cycle_cursor_pos); } - - /* Clear the pager if necessary */ + // Clear the pager if necessary. bool focused_on_search_field = (data->active_edit_line() == &data->pager.search_field_line); - if (command_ends_paging(c, focused_on_search_field)) - { + if (command_ends_paging(c, focused_on_search_field)) { clear_pager(); } + // fprintf(stderr, "\n\nchar: %ls\n\n", describe_char(c).c_str()); - //fprintf(stderr, "\n\nchar: %ls\n\n", describe_char(c).c_str()); - - switch (c) - { - /* go to beginning of line*/ - case R_BEGINNING_OF_LINE: - { + switch (c) { + // Go to beginning of line. + case R_BEGINNING_OF_LINE: { editable_line_t *el = data->active_edit_line(); - while (el->position > 0 && el->text.at(el->position - 1) != L'\n') - { + while (el->position > 0 && el->text.at(el->position - 1) != L'\n') { update_buff_pos(el, el->position - 1); } reader_repaint_needed(); break; } - - case R_END_OF_LINE: - { + case R_END_OF_LINE: { editable_line_t *el = data->active_edit_line(); - if (el->position < el->size()) - { + if (el->position < el->size()) { const wchar_t *buff = el->text.c_str(); - while (buff[el->position] && - buff[el->position] != L'\n') - { + while (buff[el->position] && buff[el->position] != L'\n') { update_buff_pos(el, el->position + 1); } - } - else - { + } else { accept_autosuggestion(true); } reader_repaint_needed(); break; } - - - case R_BEGINNING_OF_BUFFER: - { + case R_BEGINNING_OF_BUFFER: { update_buff_pos(&data->command_line, 0); reader_repaint_needed(); break; } - - /* go to EOL*/ - case R_END_OF_BUFFER: - { + case R_END_OF_BUFFER: { update_buff_pos(&data->command_line, data->command_line.size()); - reader_repaint_needed(); break; } - - case R_NULL: - { + case R_NULL: { break; } - - case R_CANCEL: - { - // The only thing we can cancel right now is paging, which we handled up above + case R_CANCEL: { + // The only thing we can cancel right now is paging, which we handled up above. break; } - case R_FORCE_REPAINT: - case R_REPAINT: - { - if (! coalescing_repaints) - { + case R_REPAINT: { + if (!coalescing_repaints) { coalescing_repaints = true; exec_prompt(); s_reset(&data->screen, screen_reset_current_line_and_prompt); @@ -3249,205 +2566,178 @@ const wchar_t *reader_readline(int nchars) } break; } - - case R_EOF: - { + case R_EOF: { exit_forced = 1; - data->end_loop=1; + data->end_loop = 1; break; } - - /* complete */ case R_COMPLETE: - case R_COMPLETE_AND_SEARCH: - { - - if (!data->complete_func) - break; + case R_COMPLETE_AND_SEARCH: { + if (!data->complete_func) break; - /* Use the command line only; it doesn't make sense to complete in any other line */ + // Use the command line only; it doesn't make sense to complete in any other line. editable_line_t *el = &data->command_line; - if (data->is_navigating_pager_contents() || (! comp_empty && last_char == R_COMPLETE)) - { - /* The user typed R_COMPLETE more than once in a row. If we are not yet fully disclosed, then become so; otherwise cycle through our available completions. */ - if (data->current_page_rendering.remaining_to_disclose > 0) - { + if (data->is_navigating_pager_contents() || + (!comp_empty && last_char == R_COMPLETE)) { + // The user typed R_COMPLETE more than once in a row. If we are not yet fully + // disclosed, then become so; otherwise cycle through our available completions. + if (data->current_page_rendering.remaining_to_disclose > 0) { data->pager.set_fully_disclosed(true); reader_repaint_needed(); + } else { + select_completion_in_direction(c == R_COMPLETE ? direction_next + : direction_prev); } - else - { - select_completion_in_direction(c == R_COMPLETE ? direction_next : direction_prev); - } - } - else - { - /* Either the user hit tab only once, or we had no visible completion list. */ - - /* Remove a trailing backslash. This may trigger an extra repaint, but this is rare. */ - if (is_backslashed(el->text, el->position)) - { + } else { + // Either the user hit tab only once, or we had no visible completion list. + // Remove a trailing backslash. This may trigger an extra repaint, but this is + // rare. + if (is_backslashed(el->text, el->position)) { remove_backward(); } - /* Get the string; we have to do this after removing any trailing backslash */ - const wchar_t * const buff = el->text.c_str(); + // Get the string; we have to do this after removing any trailing backslash. + const wchar_t *const buff = el->text.c_str(); - /* Clear the completion list */ + // Clear the completion list. comp.clear(); - /* Figure out the extent of the command substitution surrounding the cursor. This is because we only look at the current command substitution to form completions - stuff happening outside of it is not interesting. */ + // Figure out the extent of the command substitution surrounding the cursor. + // This is because we only look at the current command substitution to form + // completions - stuff happening outside of it is not interesting. const wchar_t *cmdsub_begin, *cmdsub_end; parse_util_cmdsubst_extent(buff, el->position, &cmdsub_begin, &cmdsub_end); - /* Figure out the extent of the token within the command substitution. Note we pass cmdsub_begin here, not buff */ + // Figure out the extent of the token within the command substitution. Note we + // pass cmdsub_begin here, not buff. const wchar_t *token_begin, *token_end; - parse_util_token_extent(cmdsub_begin, el->position - (cmdsub_begin-buff), &token_begin, &token_end, 0, 0); + parse_util_token_extent(cmdsub_begin, el->position - (cmdsub_begin - buff), + &token_begin, &token_end, 0, 0); - /* Hack: the token may extend past the end of the command substitution, e.g. in (echo foo) the last token is 'foo)'. Don't let that happen. */ + // Hack: the token may extend past the end of the command substitution, e.g. in + // (echo foo) the last token is 'foo)'. Don't let that happen. if (token_end > cmdsub_end) token_end = cmdsub_end; - /* Figure out how many steps to get from the current position to the end of the current token. */ + // Figure out how many steps to get from the current position to the end of the + // current token. size_t end_of_token_offset = token_end - buff; - /* Move the cursor to the end */ - if (el->position != end_of_token_offset) - { + // Move the cursor to the end. + if (el->position != end_of_token_offset) { update_buff_pos(el, end_of_token_offset); reader_repaint(); } - /* Construct a copy of the string from the beginning of the command substitution up to the end of the token we're completing */ + // Construct a copy of the string from the beginning of the command substitution + // up to the end of the token we're completing. const wcstring buffcpy = wcstring(cmdsub_begin, token_end); - //fprintf(stderr, "Complete (%ls)\n", buffcpy.c_str()); - complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT | COMPLETION_REQUEST_DESCRIPTIONS | COMPLETION_REQUEST_FUZZY_MATCH; - data->complete_func(buffcpy, &comp, complete_flags, env_vars_snapshot_t::current()); + // fprintf(stderr, "Complete (%ls)\n", buffcpy.c_str()); + complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT | + COMPLETION_REQUEST_DESCRIPTIONS | + COMPLETION_REQUEST_FUZZY_MATCH; + data->complete_func(buffcpy, &comp, complete_flags, + env_vars_snapshot_t::current()); - /* Munge our completions */ + // Munge our completions. completions_sort_and_prioritize(&comp); - /* Record our cycle_command_line */ + // Record our cycle_command_line. data->cycle_command_line = el->text; data->cycle_cursor_pos = el->position; bool continue_after_prefix_insertion = (c == R_COMPLETE_AND_SEARCH); comp_empty = handle_completions(comp, continue_after_prefix_insertion); - /* Show the search field if requested and if we printed a list of completions */ - if (c == R_COMPLETE_AND_SEARCH && ! comp_empty && ! data->pager.empty()) - { + // Show the search field if requested and if we printed a list of completions. + if (c == R_COMPLETE_AND_SEARCH && !comp_empty && !data->pager.empty()) { data->pager.set_search_field_shown(true); select_completion_in_direction(direction_next); reader_repaint_needed(); } - } - break; } - - /* kill */ - case R_KILL_LINE: - { + case R_KILL_LINE: { editable_line_t *el = data->active_edit_line(); const wchar_t *buff = el->text.c_str(); const wchar_t *begin = &buff[el->position]; const wchar_t *end = begin; - while (*end && *end != L'\n') - end++; + while (*end && *end != L'\n') end++; - if (end==begin && *end) - end++; + if (end == begin && *end) end++; - size_t len = end-begin; - if (len) - { - reader_kill(el, begin - buff, len, KILL_APPEND, last_char!=R_KILL_LINE); + size_t len = end - begin; + if (len) { + reader_kill(el, begin - buff, len, KILL_APPEND, last_char != R_KILL_LINE); } - break; } - - case R_BACKWARD_KILL_LINE: - { + case R_BACKWARD_KILL_LINE: { editable_line_t *el = data->active_edit_line(); - if (el->position > 0) - { + if (el->position > 0) { const wchar_t *buff = el->text.c_str(); const wchar_t *end = &buff[el->position]; const wchar_t *begin = end; - /* Make sure we delete at least one character (see #580) */ - begin--; + begin--; // make sure we delete at least one character (see issue #580) - /* Delete until we hit a newline, or the beginning of the string */ - while (begin > buff && *begin != L'\n') - begin--; + // Delete until we hit a newline, or the beginning of the string. + while (begin > buff && *begin != L'\n') begin--; - /* If we landed on a newline, don't delete it */ - if (*begin == L'\n') - begin++; + // If we landed on a newline, don't delete it. + if (*begin == L'\n') begin++; assert(end >= begin); - size_t len = maxi<size_t>(end-begin, 1); + size_t len = maxi<size_t>(end - begin, 1); begin = end - len; - reader_kill(el, begin - buff, len, KILL_PREPEND, last_char!=R_BACKWARD_KILL_LINE); + reader_kill(el, begin - buff, len, KILL_PREPEND, + last_char != R_BACKWARD_KILL_LINE); } break; - } - - case R_KILL_WHOLE_LINE: - { - /* We match the emacs behavior here: "kills the entire line including the following newline" */ + case R_KILL_WHOLE_LINE: { + // We match the emacs behavior here: "kills the entire line including the following + // newline". editable_line_t *el = data->active_edit_line(); const wchar_t *buff = el->text.c_str(); - /* Back up to the character just past the previous newline, or go to the beginning of the command line. Note that if the position is on a newline, visually this looks like the cursor is at the end of a line. Therefore that newline is NOT the beginning of a line; this justifies the -1 check. */ + // Back up to the character just past the previous newline, or go to the beginning + // of the command line. Note that if the position is on a newline, visually this + // looks like the cursor is at the end of a line. Therefore that newline is NOT the + // beginning of a line; this justifies the -1 check. size_t begin = el->position; - while (begin > 0 && buff[begin-1] != L'\n') - { + while (begin > 0 && buff[begin - 1] != L'\n') { begin--; } - /* Push end forwards to just past the next newline, or just past the last char. */ + // Push end forwards to just past the next newline, or just past the last char. size_t end = el->position; - while (buff[end] != L'\0') - { + while (buff[end] != L'\0') { end++; - if (buff[end-1] == L'\n') - { + if (buff[end - 1] == L'\n') { break; } } assert(end >= begin); - if (end > begin) - { - reader_kill(el, begin, end - begin, KILL_APPEND, last_char!=R_KILL_WHOLE_LINE); + if (end > begin) { + reader_kill(el, begin, end - begin, KILL_APPEND, + last_char != R_KILL_WHOLE_LINE); } break; } - - /* yank*/ - case R_YANK: - { + case R_YANK: { yank_str = kill_yank(); insert_string(data->active_edit_line(), yank_str); yank_len = wcslen(yank_str); break; } - - /* rotate killring*/ - case R_YANK_POP: - { - if (yank_len) - { - for (size_t i=0; i<yank_len; i++) - remove_backward(); + case R_YANK_POP: { + if (yank_len) { + for (size_t i = 0; i < yank_len; i++) remove_backward(); yank_str = kill_yank_rotate(); insert_string(data->active_edit_line(), yank_str); @@ -3455,22 +2745,16 @@ const wchar_t *reader_readline(int nchars) } break; } + // Escape was pressed. + case L'\x1b': { + if (data->search_mode) { + data->search_mode = NO_SEARCH; - /* Escape was pressed */ - case L'\x1b': - { - if (data->search_mode) - { - data->search_mode= NO_SEARCH; - - if (data->token_history_pos==-1) - { - //history_reset(); + if (data->token_history_pos == -1) { + // history_reset(); data->history_search.go_to_end(); reader_set_buffer(data->search_buff, data->search_buff.size()); - } - else - { + } else { reader_replace_current_token(data->search_buff); } data->search_buff.clear(); @@ -3480,399 +2764,298 @@ const wchar_t *reader_readline(int nchars) break; } - - /* delete backward*/ - case R_BACKWARD_DELETE_CHAR: - { + case R_BACKWARD_DELETE_CHAR: { remove_backward(); break; } - - /* delete forward*/ - case R_DELETE_CHAR: - { - /** - Remove the current character in the character buffer and on the - screen using syntax highlighting, etc. - */ + case R_DELETE_CHAR: { + // Remove the current character in the character buffer and on the screen using + // syntax highlighting, etc. editable_line_t *el = data->active_edit_line(); - if (el->position < el->size()) - { + if (el->position < el->size()) { update_buff_pos(el, el->position + 1); remove_backward(); } break; } - - /* - Evaluate. If the current command is unfinished, or if - the charater is escaped using a backslash, insert a - newline - */ - case R_EXECUTE: - { - /* Delete any autosuggestion */ + // Evaluate. If the current command is unfinished, or if the charater is escaped using a + // backslash, insert a newline. + case R_EXECUTE: { + // Delete any autosuggestion. data->autosuggestion.clear(); - /* If the user hits return while navigating the pager, it only clears the pager */ - if (data->is_navigating_pager_contents()) - { + // If the user hits return while navigating the pager, it only clears the pager. + if (data->is_navigating_pager_contents()) { clear_pager(); break; } - /* The user may have hit return with pager contents, but while not navigating them. Clear the pager in that event. */ + // The user may have hit return with pager contents, but while not navigating them. + // Clear the pager in that event. clear_pager(); - /* We only execute the command line */ + // We only execute the command line. editable_line_t *el = &data->command_line; - /* Allow backslash-escaped newlines, but only if the following character is whitespace, or we're at the end of the text (see issue #613) and not in a comment (#1255). */ - if (is_backslashed(el->text, el->position)) - { + // Allow backslash-escaped newlines, but only if the following character is + // whitespace, or we're at the end of the text (see issue #613) and not in a comment + // (issue #1255). + if (is_backslashed(el->text, el->position)) { bool continue_on_next_line = false; - if (el->position >= el->size()) - { - continue_on_next_line = ! text_ends_in_comment(el->text); - } - else - { + if (el->position >= el->size()) { + continue_on_next_line = !text_ends_in_comment(el->text); + } else { continue_on_next_line = iswspace(el->text.at(el->position)); } - if (continue_on_next_line) - { + if (continue_on_next_line) { insert_char(el, '\n'); break; } } - /* See if this command is valid */ + // See if this command is valid. int command_test_result = data->test_func(el->text.c_str()); - if (command_test_result == 0 || command_test_result == PARSER_TEST_INCOMPLETE) - { - /* This command is valid, but an abbreviation may make it invalid. If so, we will have to test again. */ + if (command_test_result == 0 || command_test_result == PARSER_TEST_INCOMPLETE) { + // This command is valid, but an abbreviation may make it invalid. If so, we + // will have to test again. bool abbreviation_expanded = data->expand_abbreviation_as_necessary(1); - if (abbreviation_expanded) - { - /* It's our reponsibility to rehighlight and repaint. But everything we do below triggers a repaint. */ + if (abbreviation_expanded) { + // It's our reponsibility to rehighlight and repaint. But everything we do + // below triggers a repaint. command_test_result = data->test_func(el->text.c_str()); - /* If the command is OK, then we're going to execute it. We still want to do syntax highlighting, but a synchronous variant that performs no I/O, so as not to block the user */ + // If the command is OK, then we're going to execute it. We still want to do + // syntax highlighting, but a synchronous variant that performs no I/O, so + // as not to block the user. bool skip_io = (command_test_result == 0); reader_super_highlight_me_plenty(0, skip_io); } } - switch (command_test_result) - { - - case 0: - { - /* Finished command, execute it. Don't add items that start with a leading space. */ + switch (command_test_result) { + case 0: { + // Finished command, execute it. Don't add items that start with a leading + // space. const editable_line_t *el = &data->command_line; - if (data->history != NULL && ! el->empty() && el->text.at(0) != L' ') - { + if (data->history != NULL && !el->empty() && el->text.at(0) != L' ') { data->history->add_pending_with_file_detection(el->text); } - finished=1; + finished = 1; update_buff_pos(&data->command_line, data->command_line.size()); reader_repaint(); break; } - - /* - We are incomplete, continue editing - */ - case PARSER_TEST_INCOMPLETE: - { + case PARSER_TEST_INCOMPLETE: { + // We are incomplete, continue editing. insert_char(el, '\n'); break; } - - /* - Result must be some combination including an - error. The error message will already be - printed, all we need to do is repaint - */ - default: - { + default: { + // Result must be some combination including an error. The error message + // will already be printed, all we need to do is repaint. s_reset(&data->screen, screen_reset_abandon_line); reader_repaint_needed(); break; } - } break; } - /* History functions */ case R_HISTORY_SEARCH_BACKWARD: case R_HISTORY_TOKEN_SEARCH_BACKWARD: case R_HISTORY_SEARCH_FORWARD: - case R_HISTORY_TOKEN_SEARCH_FORWARD: - { + case R_HISTORY_TOKEN_SEARCH_FORWARD: { int reset = 0; - if (data->search_mode == NO_SEARCH) - { + if (data->search_mode == NO_SEARCH) { reset = 1; - if ((c == R_HISTORY_SEARCH_BACKWARD) || - (c == R_HISTORY_SEARCH_FORWARD)) - { + if ((c == R_HISTORY_SEARCH_BACKWARD) || (c == R_HISTORY_SEARCH_FORWARD)) { data->search_mode = LINE_SEARCH; - } - else - { + } else { data->search_mode = TOKEN_SEARCH; } const editable_line_t *el = &data->command_line; data->search_buff.append(el->text); - data->history_search = history_search_t(*data->history, data->search_buff, HISTORY_SEARCH_TYPE_CONTAINS); + data->history_search = history_search_t(*data->history, data->search_buff, + HISTORY_SEARCH_TYPE_CONTAINS); - /* Skip the autosuggestion as history unless it was truncated */ + // Skip the autosuggestion as history unless it was truncated. const wcstring &suggest = data->autosuggestion; - if (! suggest.empty() && ! data->screen.autosuggestion_is_truncated) - { + if (!suggest.empty() && !data->screen.autosuggestion_is_truncated) { data->history_search.skip_matches(wcstring_list_t(&suggest, 1 + &suggest)); } } - switch (data->search_mode) - { - case LINE_SEARCH: - { + switch (data->search_mode) { + case LINE_SEARCH: { if ((c == R_HISTORY_SEARCH_BACKWARD) || - (c == R_HISTORY_TOKEN_SEARCH_BACKWARD)) - { + (c == R_HISTORY_TOKEN_SEARCH_BACKWARD)) { data->history_search.go_backwards(); - } - else - { - if (! data->history_search.go_forwards()) - { - /* If you try to go forwards past the end, we just go to the end */ + } else { + if (!data->history_search.go_forwards()) { + // If you try to go forwards past the end, we just go to the end. data->history_search.go_to_end(); } } wcstring new_text; - if (data->history_search.is_at_end()) - { + if (data->history_search.is_at_end()) { new_text = data->search_buff; - } - else - { + } else { new_text = data->history_search.current_string(); } - set_command_line_and_position(&data->command_line, new_text, new_text.size()); - + set_command_line_and_position(&data->command_line, new_text, + new_text.size()); break; } - - case TOKEN_SEARCH: - { + case TOKEN_SEARCH: { if ((c == R_HISTORY_SEARCH_BACKWARD) || - (c == R_HISTORY_TOKEN_SEARCH_BACKWARD)) - { + (c == R_HISTORY_TOKEN_SEARCH_BACKWARD)) { handle_token_history(SEARCH_BACKWARD, reset); - } - else - { + } else { handle_token_history(SEARCH_FORWARD, reset); } - break; } - } break; } - - - /* Move left*/ - case R_BACKWARD_CHAR: - { + case R_BACKWARD_CHAR: { editable_line_t *el = data->active_edit_line(); - if (data->is_navigating_pager_contents()) - { + if (data->is_navigating_pager_contents()) { select_completion_in_direction(direction_west); - } - else if (el->position > 0) - { - update_buff_pos(el, el->position-1); + } else if (el->position > 0) { + update_buff_pos(el, el->position - 1); reader_repaint_needed(); } break; } - - /* Move right*/ - case R_FORWARD_CHAR: - { + case R_FORWARD_CHAR: { editable_line_t *el = data->active_edit_line(); - if (data->is_navigating_pager_contents()) - { + if (data->is_navigating_pager_contents()) { select_completion_in_direction(direction_east); - } - else if (el->position < el->size()) - { + } else if (el->position < el->size()) { update_buff_pos(el, el->position + 1); reader_repaint_needed(); - } - else - { + } else { accept_autosuggestion(true); } break; } - - /* kill one word left */ case R_BACKWARD_KILL_WORD: case R_BACKWARD_KILL_PATH_COMPONENT: - case R_BACKWARD_KILL_BIGWORD: - { + case R_BACKWARD_KILL_BIGWORD: { move_word_style_t style = - (c == R_BACKWARD_KILL_BIGWORD ? move_word_style_whitespace : - c == R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components : move_word_style_punctuation); - bool newv = (last_char != R_BACKWARD_KILL_WORD && last_char != R_BACKWARD_KILL_PATH_COMPONENT && last_char != R_BACKWARD_KILL_BIGWORD); + (c == R_BACKWARD_KILL_BIGWORD + ? move_word_style_whitespace + : c == R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components + : move_word_style_punctuation); + bool newv = (last_char != R_BACKWARD_KILL_WORD && + last_char != R_BACKWARD_KILL_PATH_COMPONENT && + last_char != R_BACKWARD_KILL_BIGWORD); move_word(data->active_edit_line(), MOVE_DIR_LEFT, true /* erase */, style, newv); break; } - - /* kill one word right */ - case R_KILL_WORD: - { - move_word(data->active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_word_style_punctuation, last_char!=R_KILL_WORD); + case R_KILL_WORD: { + move_word(data->active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, + move_word_style_punctuation, last_char != R_KILL_WORD); break; } - - /* kill one bigword right */ - case R_KILL_BIGWORD: - { - move_word(data->active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_word_style_whitespace, last_char!=R_KILL_BIGWORD); + case R_KILL_BIGWORD: { + move_word(data->active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, + move_word_style_whitespace, last_char != R_KILL_BIGWORD); break; } - - /* move one word left*/ - case R_BACKWARD_WORD: - { - move_word(data->active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_word_style_punctuation, false); + case R_BACKWARD_WORD: { + move_word(data->active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, + move_word_style_punctuation, false); break; } - - /* move one bigword left */ - case R_BACKWARD_BIGWORD: - { - move_word(data->active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_word_style_whitespace, false); + case R_BACKWARD_BIGWORD: { + move_word(data->active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, + move_word_style_whitespace, false); break; } - - /* move one word right*/ - case R_FORWARD_WORD: - { + case R_FORWARD_WORD: { editable_line_t *el = data->active_edit_line(); - if (el->position < el->size()) - { - move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_word_style_punctuation, false); - } - else - { + if (el->position < el->size()) { + move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, + move_word_style_punctuation, false); + } else { accept_autosuggestion(false /* accept only one word */); } break; } - - /* move one bigword right */ - case R_FORWARD_BIGWORD: - { + case R_FORWARD_BIGWORD: { editable_line_t *el = data->active_edit_line(); - if (el->position < el->size()) - { - move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_word_style_whitespace, false); - } - else - { + if (el->position < el->size()) { + move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, + move_word_style_whitespace, false); + } else { accept_autosuggestion(false /* accept only one word */); } break; } - - case R_BEGINNING_OF_HISTORY: - { - if (data->is_navigating_pager_contents()) - { - select_completion_in_direction(direction_page_north); + case R_BEGINNING_OF_HISTORY: { + if (data->is_navigating_pager_contents()) { + select_completion_in_direction(direction_page_north); } else { const editable_line_t *el = &data->command_line; - data->history_search = history_search_t(*data->history, el->text, HISTORY_SEARCH_TYPE_PREFIX); + data->history_search = + history_search_t(*data->history, el->text, HISTORY_SEARCH_TYPE_PREFIX); data->history_search.go_to_beginning(); - if (! data->history_search.is_at_end()) - { + if (!data->history_search.is_at_end()) { wcstring new_text = data->history_search.current_string(); - set_command_line_and_position(&data->command_line, new_text, new_text.size()); + set_command_line_and_position(&data->command_line, new_text, + new_text.size()); } } break; } - - case R_END_OF_HISTORY: - { - if (data->is_navigating_pager_contents()) - { + case R_END_OF_HISTORY: { + if (data->is_navigating_pager_contents()) { select_completion_in_direction(direction_page_south); } else { data->history_search.go_to_end(); } break; } - case R_UP_LINE: - case R_DOWN_LINE: - { - if (data->is_navigating_pager_contents()) - { - /* We are already navigating pager contents. */ + case R_DOWN_LINE: { + if (data->is_navigating_pager_contents()) { + // We are already navigating pager contents. selection_direction_t direction; - if (c == R_DOWN_LINE) - { - /* Down arrow is always south */ + if (c == R_DOWN_LINE) { + // Down arrow is always south. direction = direction_south; - } - else if (selection_is_at_top()) - { - /* Up arrow, but we are in the first column and first row. End navigation */ + } else if (selection_is_at_top()) { + // Up arrow, but we are in the first column and first row. End navigation. direction = direction_deselect; - } - else - { - /* Up arrow, go north */ + } else { + // Up arrow, go north. direction = direction_north; } - /* Now do the selection */ + // Now do the selection. select_completion_in_direction(direction); - } - else if (c == R_DOWN_LINE && ! data->pager.empty()) - { - /* We pressed down with a non-empty pager contents, begin navigation */ + } else if (c == R_DOWN_LINE && !data->pager.empty()) { + // We pressed down with a non-empty pager contents, begin navigation. select_completion_in_direction(direction_south); - } - else - { - /* Not navigating the pager contents */ + } else { + // Not navigating the pager contents. editable_line_t *el = data->active_edit_line(); int line_old = parse_util_get_line_from_offset(el->text, el->position); int line_new; if (c == R_UP_LINE) - line_new = line_old-1; + line_new = line_old - 1; else - line_new = line_old+1; + line_new = line_old + 1; - int line_count = parse_util_lineno(el->text.c_str(), el->size())-1; + int line_count = parse_util_lineno(el->text.c_str(), el->size()) - 1; - if (line_new >= 0 && line_new <= line_count) - { + if (line_new >= 0 && line_new <= line_count) { size_t base_pos_new; size_t base_pos_old; @@ -3883,130 +3066,115 @@ const wchar_t *reader_readline(int nchars) base_pos_new = parse_util_get_offset_from_line(el->text, line_new); - base_pos_old = parse_util_get_offset_from_line(el->text, line_old); + base_pos_old = parse_util_get_offset_from_line(el->text, line_old); assert(base_pos_new != (size_t)(-1) && base_pos_old != (size_t)(-1)); indent_old = data->indents.at(base_pos_old); indent_new = data->indents.at(base_pos_new); - line_offset_old = el->position - parse_util_get_offset_from_line(el->text, line_old); - total_offset_new = parse_util_get_offset(el->text, line_new, line_offset_old - 4*(indent_new-indent_old)); + line_offset_old = + el->position - parse_util_get_offset_from_line(el->text, line_old); + total_offset_new = parse_util_get_offset( + el->text, line_new, line_offset_old - 4 * (indent_new - indent_old)); update_buff_pos(el, total_offset_new); reader_repaint_needed(); } } - break; } - - case R_SUPPRESS_AUTOSUGGESTION: - { + case R_SUPPRESS_AUTOSUGGESTION: { data->suppress_autosuggestion = true; data->autosuggestion.clear(); reader_repaint_needed(); break; } - - case R_ACCEPT_AUTOSUGGESTION: - { + case R_ACCEPT_AUTOSUGGESTION: { accept_autosuggestion(true); break; } - - case R_TRANSPOSE_CHARS: - { + case R_TRANSPOSE_CHARS: { editable_line_t *el = data->active_edit_line(); - if (el->size() < 2) - { + if (el->size() < 2) { break; } - /* If the cursor is at the end, transpose the last two characters of the line */ - if (el->position == el->size()) - { + // If the cursor is at the end, transpose the last two characters of the line. + if (el->position == el->size()) { update_buff_pos(el, el->position - 1); } - /* - Drag the character before the cursor forward over the character at the cursor, moving - the cursor forward as well. - */ - if (el->position > 0) - { + // Drag the character before the cursor forward over the character at the cursor, + // moving the cursor forward as well. + if (el->position > 0) { wcstring local_cmd = el->text; - std::swap(local_cmd.at(el->position), local_cmd.at(el->position-1)); + std::swap(local_cmd.at(el->position), local_cmd.at(el->position - 1)); set_command_line_and_position(el, local_cmd, el->position + 1); } break; } - - case R_TRANSPOSE_WORDS: - { + case R_TRANSPOSE_WORDS: { editable_line_t *el = data->active_edit_line(); size_t len = el->size(); const wchar_t *buff = el->text.c_str(); const wchar_t *tok_begin, *tok_end, *prev_begin, *prev_end; - /* If we are not in a token, look for one ahead */ + // If we are not in a token, look for one ahead. size_t buff_pos = el->position; - while (buff_pos != len && !iswalnum(buff[buff_pos])) - buff_pos++; + while (buff_pos != len && !iswalnum(buff[buff_pos])) buff_pos++; update_buff_pos(el, buff_pos); - parse_util_token_extent(buff, el->position, &tok_begin, &tok_end, &prev_begin, &prev_end); + parse_util_token_extent(buff, el->position, &tok_begin, &tok_end, &prev_begin, + &prev_end); - /* In case we didn't find a token at or after the cursor... */ - if (tok_begin == &buff[len]) - { - /* ...retry beginning from the previous token */ + // In case we didn't find a token at or after the cursor... + if (tok_begin == &buff[len]) { + // ...retry beginning from the previous token. size_t pos = prev_end - &buff[0]; - parse_util_token_extent(buff, pos, &tok_begin, &tok_end, &prev_begin, &prev_end); + parse_util_token_extent(buff, pos, &tok_begin, &tok_end, &prev_begin, + &prev_end); } - /* Make sure we have two tokens */ - if (prev_begin < prev_end && tok_begin < tok_end && tok_begin > prev_begin) - { + // Make sure we have two tokens. + if (prev_begin < prev_end && tok_begin < tok_end && tok_begin > prev_begin) { const wcstring prev(prev_begin, prev_end - prev_begin); const wcstring sep(prev_end, tok_begin - prev_end); const wcstring tok(tok_begin, tok_end - tok_begin); const wcstring trail(tok_end, &buff[len] - tok_end); - /* Compose new command line with swapped tokens */ + // Compose new command line with swapped tokens. wcstring new_buff(buff, prev_begin - buff); new_buff.append(tok); new_buff.append(sep); new_buff.append(prev); new_buff.append(trail); - /* Put cursor right after the second token */ + // Put cursor right after the second token. set_command_line_and_position(el, new_buff, tok_end - buff); } break; } - case R_UPCASE_WORD: case R_DOWNCASE_WORD: - case R_CAPITALIZE_WORD: - { + case R_CAPITALIZE_WORD: { editable_line_t *el = data->active_edit_line(); - // For capitalize_word, whether we've capitalized a character so far + // For capitalize_word, whether we've capitalized a character so far. bool capitalized_first = false; - // We apply the operation from the current location to the end of the word + // We apply the operation from the current location to the end of the word. size_t pos = el->position; move_word(el, MOVE_DIR_RIGHT, false, move_word_style_punctuation, false); - for (; pos < el->position; pos++) - { + for (; pos < el->position; pos++) { wchar_t chr = el->text.at(pos); - // We always change the case; this decides whether we go uppercase (true) or lowercase (false) + // We always change the case; this decides whether we go uppercase (true) or + // lowercase (false). bool make_uppercase; if (c == R_CAPITALIZE_WORD) - make_uppercase = ! capitalized_first && iswalnum(chr); + make_uppercase = !capitalized_first && iswalnum(chr); else make_uppercase = (c == R_UPCASE_WORD); - // Apply the operation and then record what we did + // Apply the operation and then record what we did. if (make_uppercase) chr = towupper(chr); else @@ -4020,18 +3188,14 @@ const wchar_t *reader_readline(int nchars) reader_repaint_needed(); break; } - - case R_BEGIN_SELECTION: - { + case R_BEGIN_SELECTION: { data->sel_active = true; data->sel_begin_pos = data->command_line.position; data->sel_start_pos = data->command_line.position; data->sel_stop_pos = data->command_line.position; break; } - - case R_SWAP_SELECTION_START_STOP: - { + case R_SWAP_SELECTION_START_STOP: { if (!data->sel_active) break; size_t tmp = data->sel_begin_pos; data->sel_begin_pos = data->command_line.position; @@ -4040,36 +3204,27 @@ const wchar_t *reader_readline(int nchars) update_buff_pos(el, tmp); break; } - - case R_END_SELECTION: - { + case R_END_SELECTION: { data->sel_active = false; data->sel_start_pos = data->command_line.position; data->sel_stop_pos = data->command_line.position; break; } - - case R_KILL_SELECTION: - { + case R_KILL_SELECTION: { bool newv = (last_char != R_KILL_SELECTION); size_t start, len; - if (reader_get_selection(&start, &len)) - { + if (reader_get_selection(&start, &len)) { reader_kill(&data->command_line, start, len, KILL_APPEND, newv); } break; } - - case R_FORWARD_JUMP: - { + case R_FORWARD_JUMP: { editable_line_t *el = data->active_edit_line(); wchar_t target = input_function_pop_arg(); bool status = false; - for (size_t i = el->position + 1; i < el->size(); i++) - { - if (el->at(i) == target) - { + for (size_t i = el->position + 1; i < el->size(); i++) { + if (el->at(i) == target) { update_buff_pos(el, i); status = true; break; @@ -4079,18 +3234,14 @@ const wchar_t *reader_readline(int nchars) reader_repaint_needed(); break; } - - case R_BACKWARD_JUMP: - { + case R_BACKWARD_JUMP: { editable_line_t *el = data->active_edit_line(); wchar_t target = input_function_pop_arg(); bool status = false; size_t tmp_pos = el->position; - while (tmp_pos--) - { - if (el->at(tmp_pos) == target) - { + while (tmp_pos--) { + if (el->at(tmp_pos) == target) { update_buff_pos(el, tmp_pos); status = true; break; @@ -4100,60 +3251,41 @@ const wchar_t *reader_readline(int nchars) reader_repaint_needed(); break; } - - /* Other, if a normal character, we add it to the command */ - default: - { - if ((!wchar_private(c)) && (((c>31) || (c==L'\n'))&& (c != 127))) - { + default: { + // Other, if a normal character, we add it to the command. + if ((!wchar_private(c)) && (((c > 31) || (c == L'\n')) && (c != 127))) { bool allow_expand_abbreviations = false; - if (data->is_navigating_pager_contents()) - { + if (data->is_navigating_pager_contents()) { data->pager.set_search_field_shown(true); - } - else - { + } else { allow_expand_abbreviations = true; } - /* Regular character */ + // Regular character. editable_line_t *el = data->active_edit_line(); insert_char(data->active_edit_line(), c, allow_expand_abbreviations); - /* End paging upon inserting into the normal command line */ - if (el == &data->command_line) - { + // End paging upon inserting into the normal command line. + if (el == &data->command_line) { clear_pager(); } - - } - else - { - /* - Low priority debug message. These can happen if - the user presses an unefined control - sequnece. No reason to report. - */ + } else { + // Low priority debug message. These can happen if the user presses an unefined + // control sequnece. No reason to report. debug(2, _(L"Unknown keybinding %d"), c); } break; } - } - if ((c != R_HISTORY_SEARCH_BACKWARD) && - (c != R_HISTORY_SEARCH_FORWARD) && - (c != R_HISTORY_TOKEN_SEARCH_BACKWARD) && - (c != R_HISTORY_TOKEN_SEARCH_FORWARD) && - (c != R_NULL) && - (c != R_REPAINT) && - (c != R_FORCE_REPAINT)) - { + if ((c != R_HISTORY_SEARCH_BACKWARD) && (c != R_HISTORY_SEARCH_FORWARD) && + (c != R_HISTORY_TOKEN_SEARCH_BACKWARD) && (c != R_HISTORY_TOKEN_SEARCH_FORWARD) && + (c != R_NULL) && (c != R_REPAINT) && (c != R_FORCE_REPAINT)) { data->search_mode = NO_SEARCH; data->search_buff.clear(); data->history_search.go_to_end(); - data->token_history_pos=-1; + data->token_history_pos = -1; } last_char = c; @@ -4163,94 +3295,74 @@ const wchar_t *reader_readline(int nchars) writestr(L"\n"); - /* Ensure we have no pager contents when we exit */ - if (! data->pager.empty()) - { - /* Clear to end of screen to erase the pager contents. TODO: this may fail if eos doesn't exist, in which case we should emit newlines */ + // Ensure we have no pager contents when we exit. + if (!data->pager.empty()) { + // Clear to end of screen to erase the pager contents. + // TODO: this may fail if eos doesn't exist, in which case we should emit newlines. screen_force_clear_to_end(); data->pager.clear(); } - if (!reader_exit_forced()) - { - if (tcsetattr(0,TCSANOW,&old_modes)) /* return to previous mode */ - { - wperror(L"tcsetattr"); + if (!reader_exit_forced()) { + if (tcsetattr(0, TCSANOW, &old_modes)) { + wperror(L"tcsetattr"); // return to previous mode } - set_color(rgb_color_t::reset(), rgb_color_t::reset()); } return finished ? data->command_line.text.c_str() : NULL; } -int reader_search_mode() -{ - if (!data) - { +int reader_search_mode() { + if (!data) { return -1; } - return !!data->search_mode; } -int reader_has_pager_contents() -{ - if (!data) - { +int reader_has_pager_contents() { + if (!data) { return -1; } - return ! data->current_page_rendering.screen_data.empty(); + return !data->current_page_rendering.screen_data.empty(); } -/** - Read non-interactively. Read input from stdin without displaying - the prompt, using syntax highlighting. This is used for reading - scripts and init files. -*/ -static int read_ni(int fd, const io_chain_t &io) -{ +/// Read non-interactively. Read input from stdin without displaying the prompt, using syntax +/// highlighting. This is used for reading scripts and init files. +static int read_ni(int fd, const io_chain_t &io) { parser_t &parser = parser_t::principal_parser(); FILE *in_stream; - wchar_t *buff=0; + wchar_t *buff = 0; std::vector<char> acc; int des = (fd == STDIN_FILENO ? dup(STDIN_FILENO) : fd); - int res=0; + int res = 0; - if (des == -1) - { + if (des == -1) { wperror(L"dup"); return 1; } in_stream = fdopen(des, "r"); - if (in_stream != 0) - { - while (!feof(in_stream)) - { + if (in_stream != 0) { + while (!feof(in_stream)) { char buff[4096]; size_t c = fread(buff, 1, 4096, in_stream); - if (ferror(in_stream)) - { - if (errno == EINTR) - { - /* We got a signal, just keep going. Be sure that we call insert() below because we may get data as well as EINTR. */ + if (ferror(in_stream)) { + if (errno == EINTR) { + // We got a signal, just keep going. Be sure that we call insert() below because + // we may get data as well as EINTR. clearerr(in_stream); - } - else if ((errno == EAGAIN || errno == EWOULDBLOCK) && make_fd_blocking(des) == 0) - { - /* We succeeded in making the fd blocking, keep going */ + } else if ((errno == EAGAIN || errno == EWOULDBLOCK) && + make_fd_blocking(des) == 0) { + // We succeeded in making the fd blocking, keep going. clearerr(in_stream); - } - else - { - /* Fatal error */ + } else { + // Fatal error. debug(1, _(L"Error while reading from file descriptor")); - - /* Reset buffer on error. We won't evaluate incomplete files. */ + // Reset buffer on error. We won't evaluate incomplete files. acc.clear(); break; } @@ -4262,66 +3374,49 @@ static int read_ni(int fd, const io_chain_t &io) wcstring str = acc.empty() ? wcstring() : str2wcstring(&acc.at(0), acc.size()); acc.clear(); - if (fclose(in_stream)) - { - debug(1, - _(L"Error while closing input stream")); + if (fclose(in_stream)) { + debug(1, _(L"Error while closing input stream")); wperror(L"fclose"); res = 1; } - /* Swallow a BOM (#1518) */ - if (! str.empty() && str.at(0) == UTF8_BOM_WCHAR) - { + // Swallow a BOM (issue #1518). + if (!str.empty() && str.at(0) == UTF8_BOM_WCHAR) { str.erase(0, 1); } parse_error_list_t errors; parse_node_tree_t tree; - if (! parse_util_detect_errors(str, &errors, false /* do not accept incomplete */, &tree)) - { + if (!parse_util_detect_errors(str, &errors, false /* do not accept incomplete */, &tree)) { parser.eval_acquiring_tree(str, io, TOP, moved_ref<parse_node_tree_t>(tree)); - } - else - { + } else { wcstring sb; parser.get_backtrace(str, errors, &sb); fwprintf(stderr, L"%ls", sb.c_str()); res = 1; } - } - else - { - debug(1, - _(L"Error while opening input stream")); + } else { + debug(1, _(L"Error while opening input stream")); wperror(L"fdopen"); free(buff); - res=1; + res = 1; } return res; } -int reader_read(int fd, const io_chain_t &io) -{ +int reader_read(int fd, const io_chain_t &io) { int res; - /* - If reader_read is called recursively through the '.' builtin, we - need to preserve is_interactive. This, and signal handler setup - is handled by proc_push_interactive/proc_pop_interactive. - */ - + // If reader_read is called recursively through the '.' builtin, we need to preserve + // is_interactive. This, and signal handler setup is handled by + // proc_push_interactive/proc_pop_interactive. int inter = ((fd == STDIN_FILENO) && isatty(STDIN_FILENO)); proc_push_interactive(inter); - res= get_is_interactive() ? read_i():read_ni(fd, io); + res = get_is_interactive() ? read_i() : read_ni(fd, io); - /* - If the exit command was called in a script, only exit the - script, not the program. - */ - if (data) - data->end_loop = 0; + // If the exit command was called in a script, only exit the script, not the program. + if (data) data->end_loop = 0; end_loop = 0; proc_pop_interactive(); diff --git a/src/reader.h b/src/reader.h index 874b4711..4c5a511e 100644 --- a/src/reader.h +++ b/src/reader.h @@ -1,18 +1,13 @@ -/** \file reader.h - - Prototypes for functions for reading data from stdin and passing - to the parser. If stdin is a keyboard, it supplies a killring, - history, syntax highlighting, tab-completion and various other - features. -*/ - +// Prototypes for functions for reading data from stdin and passing to the parser. If stdin is a +// keyboard, it supplies a killring, history, syntax highlighting, tab-completion and various other +// features. #ifndef FISH_READER_H #define FISH_READER_H -#include <vector> -#include <string> -#include <stddef.h> #include <stdbool.h> +#include <stddef.h> +#include <string> +#include <vector> #include "common.h" #include "complete.h" @@ -23,299 +18,213 @@ class history_t; class env_vars_snapshot_t; class io_chain_t; -/* Helper class for storing a command line */ -class editable_line_t -{ -public: - - /** The command line */ +/// Helper class for storing a command line. +class editable_line_t { + public: + /// The command line. wcstring text; - - /** The current position of the cursor in the command line */ + /// The current position of the cursor in the command line. size_t position; - const wcstring &get_text() const - { - return text; - } + const wcstring &get_text() const { return text; } - /* Gets the length of the text */ - size_t size() const - { - return text.size(); - } + // Gets the length of the text. + size_t size() const { return text.size(); } - bool empty() const - { - return text.empty(); - } + bool empty() const { return text.empty(); } - void clear() - { + void clear() { text.clear(); position = 0; } - wchar_t at(size_t idx) - { - return text.at(idx); - } + wchar_t at(size_t idx) { return text.at(idx); } - editable_line_t() : text(), position(0) - { - } + editable_line_t() : text(), position(0) {} - /* Inserts a substring of str given by start, len at the cursor position */ + /// Inserts a substring of str given by start, len at the cursor position. void insert_string(const wcstring &str, size_t start = 0, size_t len = wcstring::npos); }; -/** - Read commands from \c fd until encountering EOF -*/ +/// Read commands from \c fd until encountering EOF. int reader_read(int fd, const io_chain_t &io); -/** - Tell the shell that it should exit after the currently running command finishes. -*/ +/// Tell the shell that it should exit after the currently running command finishes. void reader_exit(int do_exit, int force); -/** - Check that the reader is in a sane state -*/ +/// Check that the reader is in a sane state. void reader_sanity_check(); -/** - Initialize the reader -*/ +/// Initialize the reader. void reader_init(); -/** - Destroy and free resources used by the reader -*/ +/// Destroy and free resources used by the reader. void reader_destroy(); -/** Restore the term mode at startup */ +/// Restore the term mode at startup. void restore_term_mode(); -/** - Returns the filename of the file currently read -*/ +/// Returns the filename of the file currently read. const wchar_t *reader_current_filename(); -/** - Push a new filename on the stack of read files - - \param fn The fileanme to push -*/ +/// Push a new filename on the stack of read files. +/// +/// \param fn The fileanme to push void reader_push_current_filename(const wchar_t *fn); -/** - Pop the current filename from the stack of read files - */ -void reader_pop_current_filename(); -/** - Write the title to the titlebar. This function is called just - before a new application starts executing and just after it - finishes. +/// Pop the current filename from the stack of read files. +void reader_pop_current_filename(); - \param cmd Command line string passed to \c fish_title if is defined. - \param reset_cursor_position If set, issue a \r so the line driver knows where we are -*/ +/// Write the title to the titlebar. This function is called just before a new application starts +/// executing and just after it finishes. +/// +/// \param cmd Command line string passed to \c fish_title if is defined. +/// \param reset_cursor_position If set, issue a \r so the line driver knows where we are void reader_write_title(const wcstring &cmd, bool reset_cursor_position = true); -/** - Call this function to tell the reader that a repaint is needed, and - should be performed when possible. - */ +/// Call this function to tell the reader that a repaint is needed, and should be performed when +/// possible. void reader_repaint_needed(); -/** Call this function to tell the reader that some color has changed. */ +/// Call this function to tell the reader that some color has changed. void reader_react_to_color_change(); -/* Repaint immediately if needed. */ +/// Repaint immediately if needed. void reader_repaint_if_needed(); -/** - Run the specified command with the correct terminal modes, and - while taking care to perform job notification, set the title, etc. -*/ +/// Run the specified command with the correct terminal modes, and while taking care to perform job +/// notification, set the title, etc. void reader_run_command(const wcstring &buff); -/** - Get the string of character currently entered into the command - buffer, or 0 if interactive mode is uninitialized. -*/ +/// Get the string of character currently entered into the command buffer, or 0 if interactive mode +/// is uninitialized. const wchar_t *reader_get_buffer(); -/** Returns the current reader's history */ +/// Returns the current reader's history. history_t *reader_get_history(void); -/** - Set the string of characters in the command buffer, as well as the cursor position. - - \param b the new buffer value - \param p the cursor position. If \c p is larger than the length of the command line, - the cursor is placed on the last character. -*/ +/// Set the string of characters in the command buffer, as well as the cursor position. +/// +/// \param b the new buffer value +/// \param p the cursor position. If \c p is larger than the length of the command line, the cursor +/// is placed on the last character. void reader_set_buffer(const wcstring &b, size_t p); -/** - Get the current cursor position in the command line. If interactive - mode is uninitialized, return (size_t)(-1). -*/ +/// Get the current cursor position in the command line. If interactive mode is uninitialized, +/// return (size_t)(-1). size_t reader_get_cursor_pos(); - -/** - Get the current selection range in the command line. - Returns false if there is no active selection, true otherwise. -*/ +/// Get the current selection range in the command line. Returns false if there is no active +/// selection, true otherwise. bool reader_get_selection(size_t *start, size_t *len); -/** - Return the value of the interrupted flag, which is set by the sigint - handler, and clear it if it was set. -*/ +/// Return the value of the interrupted flag, which is set by the sigint handler, and clear it if it +/// was set. int reader_interrupted(); -/** - Clear the interrupted flag unconditionally without handling anything. The - flag could have been set e.g. when an interrupt arrived just as we were - ending an earlier \c reader_readline invocation but before the - \c is_interactive_read flag was cleared. -*/ +/// Clear the interrupted flag unconditionally without handling anything. The flag could have been +/// set e.g. when an interrupt arrived just as we were ending an earlier \c reader_readline +/// invocation but before the \c is_interactive_read flag was cleared. void reader_reset_interrupted(); -/** - Return the value of the interrupted flag, which is set by the sigint - handler, and clear it if it was set. If the current reader is interruptible, - call \c reader_exit(). -*/ +/// Return the value of the interrupted flag, which is set by the sigint handler, and clear it if it +/// was set. If the current reader is interruptible, call \c reader_exit(). int reader_reading_interrupted(); -/** - Returns true if the current reader generation count does not equal the - generation count the current thread was started with. - Note 1: currently only valid for autocompletion threads! Other threads don't - set the threadlocal generation count when they start up. -*/ +/// Returns true if the current reader generation count does not equal the generation count the +/// current thread was started with. Note 1: currently only valid for autocompletion threads! Other +/// threads don't set the threadlocal generation count when they start up. bool reader_thread_job_is_stale(); -/** - Read one line of input. Before calling this function, reader_push() must have - been called in order to set up a valid reader environment. If nchars > 0, - return after reading that many characters even if a full line has not yet - been read. Note: the returned value may be longer than nchars if a single - keypress resulted in multiple characters being inserted into the commandline. -*/ +/// Read one line of input. Before calling this function, reader_push() must have been called in +/// order to set up a valid reader environment. If nchars > 0, return after reading that many +/// characters even if a full line has not yet been read. Note: the returned value may be longer +/// than nchars if a single keypress resulted in multiple characters being inserted into the +/// commandline. const wchar_t *reader_readline(int nchars); -/** - Push a new reader environment. -*/ +/// Push a new reader environment. void reader_push(const wchar_t *name); -/** - Return to previous reader environment -*/ +/// Return to previous reader environment. void reader_pop(); -/** - Specify function to use for finding possible tab completions. The function must take these arguments: - - - The command to be completed as a null terminated array of wchar_t - - An array_list_t in which completions will be inserted. -*/ -typedef void (*complete_function_t)(const wcstring &, std::vector<completion_t> *, completion_request_flags_t, const env_vars_snapshot_t &); +/// Specify function to use for finding possible tab completions. The function must take these +/// arguments: +/// +/// - The command to be completed as a null terminated array of wchar_t +/// - An array_list_t in which completions will be inserted. +typedef void (*complete_function_t)(const wcstring &, std::vector<completion_t> *, + completion_request_flags_t, const env_vars_snapshot_t &); void reader_set_complete_function(complete_function_t); -/** - The type of a highlight function. - */ -typedef void (*highlight_function_t)(const wcstring &, std::vector<highlight_spec_t> &, size_t, wcstring_list_t *, const env_vars_snapshot_t &vars); +/// The type of a highlight function. +typedef void (*highlight_function_t)(const wcstring &, std::vector<highlight_spec_t> &, size_t, + wcstring_list_t *, const env_vars_snapshot_t &vars); -/** - Specify function for syntax highlighting. The function must take these arguments: - - - The command to be highlighted as a null terminated array of wchar_t - - The color code of each character as an array of ints - - The cursor position - - An array_list_t used for storing error messages - */ +/// Specify function for syntax highlighting. The function must take these arguments: +/// +/// - The command to be highlighted as a null terminated array of wchar_t +/// - The color code of each character as an array of ints +/// - The cursor position +/// - An array_list_t used for storing error messages void reader_set_highlight_function(highlight_function_t); -/** - Specify function for testing if the command buffer contains syntax - errors that must be corrected before returning. -*/ +/// Specify function for testing if the command buffer contains syntax errors that must be corrected +/// before returning. void reader_set_test_function(parser_test_error_bits_t (*f)(const wchar_t *)); -/** - Specify string of shell commands to be run in order to generate the - prompt. -*/ +/// Specify string of shell commands to be run in order to generate the prompt. void reader_set_left_prompt(const wcstring &prompt); -/** - Specify string of shell commands to be run in order to generate the - right prompt. -*/ +/// Specify string of shell commands to be run in order to generate the right prompt. void reader_set_right_prompt(const wcstring &prompt); - -/** Sets whether autosuggesting is allowed. */ +/// Sets whether autosuggesting is allowed. void reader_set_allow_autosuggesting(bool flag); -/** Sets whether abbreviation expansion is performed. */ +/// Sets whether abbreviation expansion is performed. void reader_set_expand_abbreviations(bool flag); - -/** Sets whether the reader should exit on ^C. */ +/// Sets whether the reader should exit on ^C. void reader_set_exit_on_interrupt(bool flag); -/** - Returns true if the shell is exiting, 0 otherwise. -*/ +/// Returns true if the shell is exiting, 0 otherwise. bool shell_is_exiting(); -/** - The readers interrupt signal handler. Cancels all currently running blocks. -*/ +/// The readers interrupt signal handler. Cancels all currently running blocks. void reader_handle_int(int signal); -/** - This function returns true if fish is exiting by force, i.e. because stdin died -*/ +/// This function returns true if fish is exiting by force, i.e. because stdin died. int reader_exit_forced(); -/** - Test if the given shell command contains errors. Uses parser_test - for testing. Suitable for reader_set_test_function(). -*/ +/// Test if the given shell command contains errors. Uses parser_test for testing. Suitable for +/// reader_set_test_function(). parser_test_error_bits_t reader_shell_test(const wchar_t *b); -/** - Test whether the interactive reader is in search mode. - - \return 0 if not in search mode, 1 if in search mode and -1 if not in interactive mode - */ +/// Test whether the interactive reader is in search mode. +/// +/// \return 0 if not in search mode, 1 if in search mode and -1 if not in interactive mode int reader_search_mode(); -/** - Test whether the interactive reader has visible pager contents. - - \return 0 if it has pager contents, 1 if it does not have pager contents, and -1 if not in interactive mode - */ +/// Test whether the interactive reader has visible pager contents. +/// +/// \return 0 if it has pager contents, 1 if it does not have pager contents, and -1 if not in +/// interactive mode int reader_has_pager_contents(); +/// Given a command line and an autosuggestion, return the string that gets shown to the user. +/// Exposed for testing purposes only. +wcstring combine_command_and_autosuggestion(const wcstring &cmdline, + const wcstring &autosuggestion); -/* Given a command line and an autosuggestion, return the string that gets shown to the user. Exposed for testing purposes only. */ -wcstring combine_command_and_autosuggestion(const wcstring &cmdline, const wcstring &autosuggestion); - -/* Expand abbreviations at the given cursor position. Exposed for testing purposes only. */ -bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos, wcstring *output); +/// Expand abbreviations at the given cursor position. Exposed for testing purposes only. +bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos, + wcstring *output); -/* Apply a completion string. Exposed for testing only. */ -wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flags_t flags, const wcstring &command_line, size_t *inout_cursor_pos, bool append_only); +/// Apply a completion string. Exposed for testing only. +wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flags_t flags, + const wcstring &command_line, size_t *inout_cursor_pos, + bool append_only); #endif |