Merge pull request #18 from ClickHouse-Extras/amosbird-rerenderprompt

Always re-render prompt while navigating history
ClickHouse · Nov 23, 2021 · f019cba · f019cba
2 parents 68410ac + 7de81e3
commit f019cba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/replxx_impl.cxx b/src/replxx_impl.cxx
@@ -974,14 +974,20 @@ int Replxx::ReplxxImpl::virtual_render( char32_t const* buffer_, int len_, int&
  * Refresh the user's input line: the prompt is already onscreen and is not
  * redrawn here screen position
  */
-void Replxx::ReplxxImpl::refresh_line( HINT_ACTION hintAction_ ) {
+void Replxx::ReplxxImpl::refresh_line( HINT_ACTION hintAction_, bool refreshPrompt_ ) {
 	int long long now( now_us() );
 	int long long duration( now - _lastRefreshTime );
 	if ( duration < RAPID_REFRESH_US ) {
 		_lastRefreshTime = now;
 		_refreshSkipped = true;
 		return;
 	}
+	if ( refreshPrompt_ )
+	{
+		_terminal.jump_cursor( 0, 0 );
+		_prompt.write();
+		_prompt._cursorRowOffset = _prompt._extraLines;
+	}
 	_refreshSkipped = false;
 	render( hintAction_ );
 	handle_hints( hintAction_ );
@@ -1950,7 +1956,7 @@ Replxx::ACTION_RESULT Replxx::ReplxxImpl::history_move( bool previous_ ) {
 	}
 	_data.assign( _history.current() );
 	_pos = _data.length();
-	refresh_line();
+	refresh_line( HINT_ACTION::REGENERATE, true /* refreshPrompt */ );
 	return ( Replxx::ACTION_RESULT::CONTINUE );
 }
 
@@ -2022,7 +2028,7 @@ Replxx::ACTION_RESULT Replxx::ReplxxImpl::history_jump( bool back_ ) {
 		_history.jump( back_ );
 		_data.assign( _history.current() );
 		_pos = _data.length();
-		refresh_line();
+		refresh_line( HINT_ACTION::REGENERATE, true /* refreshPrompt */ );
 	}
 	return ( Replxx::ACTION_RESULT::CONTINUE );
 }

diff --git a/src/replxx_impl.hxx b/src/replxx_impl.hxx
@@ -272,7 +272,7 @@ private:
 	void call_modify_callback( void );
 	completions_t call_completer( std::string const& input, int& ) const;
 	hints_t call_hinter( std::string const& input, int&, Replxx::Color& color ) const;
-	void refresh_line( HINT_ACTION = HINT_ACTION::REGENERATE );
+	void refresh_line( HINT_ACTION = HINT_ACTION::REGENERATE, bool refreshPrompt_ = false );
 	void move_cursor( void );
 	void indent( void );
 	int virtual_render( char32_t const*, int, int&, int&, Prompt const* = nullptr );