Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed token search (note: this didn't work properly even in the original fish!)

Browse source 
Fixes https://github.com/fish-shell/fish-shell/issues/61
This commit is contained in:
ridiculousfish 2012-06-12 09:41:30 -07:00
parent 9b781c4c06
commit 1ed65b6bd7
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
reader.cpp
View file

@ -1774,6 +1774,19 @@ void reader_sanity_check()
} }
} }
/**
Set the specified string from the history as the current buffer. Do
not modify prefix_width.
*/
static void set_command_line_and_position( const wcstring &new_str, int pos )
{
data->command_line = new_str;
data->command_line_changed();
data->buff_pos = pos;
reader_super_highlight_me_plenty( data->buff_pos );
reader_repaint();
}
void reader_replace_current_token( const wchar_t *new_token ) void reader_replace_current_token( const wchar_t *new_token )
{ {
@ -1792,23 +1805,11 @@ void reader_replace_current_token( const wchar_t *new_token )
new_buff.append(new_token); new_buff.append(new_token);
new_buff.append(end); new_buff.append(end);
new_pos = (begin-buff) + wcslen(new_token); new_pos = (begin-buff) + wcslen(new_token);
reader_set_buffer(new_buff, new_pos);
set_command_line_and_position(new_buff, new_pos);
} }
/**
Set the specified string from the history as the current buffer. Do
not modify prefix_width.
*/
static void handle_history( const wcstring &new_str )
{
data->command_line = new_str;
data->command_line_changed();
data->buff_pos=data->command_line.size();
reader_super_highlight_me_plenty( data->buff_pos );
reader_repaint();
}
/** /**
Reset the data structures associated with the token search Reset the data structures associated with the token search
*/ */
@ -1828,6 +1829,8 @@ static void reset_token_history()
data->search_pos=0; data->search_pos=0;
data->search_prev.clear(); data->search_prev.clear();
data->search_prev.push_back(data->search_buff); data->search_prev.push_back(data->search_buff);
data->history_search = history_search_t(*data->history, data->search_buff, HISTORY_SEARCH_TYPE_CONTAINS);
} }
@ -1937,7 +1940,7 @@ static void handle_token_history( int forward, int reset )
//debug( 3, L"ok pos" ); //debug( 3, L"ok pos" );
const wcstring last_tok = tok_last( &tok ); const wcstring last_tok = tok_last( &tok );
if (find(data->search_prev.begin(), data->search_prev.end(), last_tok) != data->search_prev.end()) { if (find(data->search_prev.begin(), data->search_prev.end(), last_tok) == data->search_prev.end()) {
data->token_history_pos = tok_get_pos( &tok ); data->token_history_pos = tok_get_pos( &tok );
str = wcsdup(tok_last( &tok )); str = wcsdup(tok_last( &tok ));
} }
@ -3122,7 +3125,7 @@ const wchar_t *reader_readline()
} else { } else {
new_text = data->history_search.current_string(); new_text = data->history_search.current_string();
} }
handle_history(new_text); set_command_line_and_position(new_text, new_text.size());
break; break;
} }