Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-05 17:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove sanity_check from reader

Browse source 
It hardly checks anything and isn't adding any value.
This commit is contained in:
ridiculousfish 2020-08-22 12:34:45 -07:00
parent a3a8992f81
commit 9f4b00d95b
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/reader.cpp
View file

@ -600,7 +600,6 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
bool handle_completions(const completion_list_t &comp, size_t token_begin, size_t token_end); bool handle_completions(const completion_list_t &comp, size_t token_begin, size_t token_end);
void sanity_check() const;
void set_command_line_and_position(editable_line_t *el, wcstring &&new_str, size_t pos); void set_command_line_and_position(editable_line_t *el, wcstring &&new_str, size_t pos);
void clear_transient_edit(); void clear_transient_edit();
void replace_current_token(wcstring &&new_token); void replace_current_token(wcstring &&new_token);
@ -1512,7 +1511,6 @@ void reader_data_t::autosuggest_completed(autosuggestion_result_t result) {
string_prefixes_string_case_insensitive(result.search_string, result.suggestion)) { string_prefixes_string_case_insensitive(result.search_string, result.suggestion)) {
// Autosuggestion is active and the search term has not changed, so we're good to go. // Autosuggestion is active and the search term has not changed, so we're good to go.
autosuggestion = std::move(result.suggestion); autosuggestion = std::move(result.suggestion);
sanity_check();
repaint(); repaint();
} }
} }
@ -1993,11 +1991,6 @@ static void reader_interactive_destroy() {
outputter_t::stdoutput().set_color(rgb_color_t::reset(), rgb_color_t::reset()); outputter_t::stdoutput().set_color(rgb_color_t::reset(), rgb_color_t::reset());
} }
void reader_data_t::sanity_check() const {
if (command_line.position() > command_line.size()) sanity_lose();
if (colors.size() != command_line.size()) sanity_lose();
}
/// Set the specified string as the current buffer. /// Set the specified string as the current buffer.
void reader_data_t::set_command_line_and_position(editable_line_t *el, wcstring &&new_str, void reader_data_t::set_command_line_and_position(editable_line_t *el, wcstring &&new_str,
size_t pos) { size_t pos) {
@ -2229,7 +2222,6 @@ void reader_data_t::highlight_complete(highlight_result_t result) {
assert(result.colors.size() == command_line.size()); assert(result.colors.size() == command_line.size());
if (colors != result.colors) { if (colors != result.colors) {
colors = std::move(result.colors); colors = std::move(result.colors);
sanity_check();
highlight_search(); highlight_search();
repaint(); repaint();
} }
@ -2262,7 +2254,6 @@ void reader_data_t::super_highlight_me_plenty(bool no_io) {
if (!conf.highlight_ok) return; if (!conf.highlight_ok) return;
const editable_line_t *el = &command_line; const editable_line_t *el = &command_line;
sanity_check();
auto highlight_performer = get_highlight_performer(parser(), el->text(), !no_io); auto highlight_performer = get_highlight_performer(parser(), el->text(), !no_io);
if (no_io) { if (no_io) {
@ -3789,12 +3780,6 @@ history_t *reader_get_history() {
return data ? data->history : nullptr; return data ? data->history : nullptr;
} }
void reader_sanity_check() {
if (reader_data_t *data = current_data_or_null()) {
data->sanity_check();
}
}
/// Sets the command line contents, clearing the pager. /// Sets the command line contents, clearing the pager.
void reader_set_buffer(const wcstring &b, size_t pos) { void reader_set_buffer(const wcstring &b, size_t pos) {
reader_data_t *data = current_data_or_null(); reader_data_t *data = current_data_or_null();

3
src/reader.h
View file

@ -121,9 +121,6 @@ int reader_read(parser_t &parser, int fd, const io_chain_t &io);
/// Mark that we encountered SIGHUP and must (soon) exit. This is invoked from a signal handler. /// Mark that we encountered SIGHUP and must (soon) exit. This is invoked from a signal handler.
void reader_sighup(); void reader_sighup();
/// Check that the reader is in a sane state.
void reader_sanity_check();
/// Initialize the reader. /// Initialize the reader.
void reader_init(); void reader_init();