RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 19:37:34 +00:00
Code Issues Activity Actions

LibLine: Clear trailing trivia when cycling if the suggestion has any

Browse source
This commit is contained in:
AnotherTest 2020-04-19 21:57:14 +04:30 • committed by Andreas Kling
parent b07bd1b95c
commit c97ca2fecc
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibLine/Editor.cpp
View file

@ -351,7 +351,7 @@ String Editor::get_line(const String& prompt)
case 2: case 2:
actual_offset = m_cursor - m_largest_common_suggestion_prefix_length + m_next_suggestion_invariant_offset; actual_offset = m_cursor - m_largest_common_suggestion_prefix_length + m_next_suggestion_invariant_offset;
if (can_complete) if (can_complete)
shown_length = m_largest_common_suggestion_prefix_length; shown_length = m_largest_common_suggestion_prefix_length + m_last_shown_suggestion.trailing_trivia.length();
break; break;
default: default:
if (m_last_shown_suggestion_display_length == 0) if (m_last_shown_suggestion_display_length == 0)
@ -391,6 +391,7 @@ String Editor::get_line(const String& prompt)
insert(m_last_shown_suggestion.text.substring_view(m_next_suggestion_invariant_offset, m_last_shown_suggestion.text.length() - m_next_suggestion_invariant_offset)); insert(m_last_shown_suggestion.text.substring_view(m_next_suggestion_invariant_offset, m_last_shown_suggestion.text.length() - m_next_suggestion_invariant_offset));
// add in the trivia of the last selected suggestion // add in the trivia of the last selected suggestion
insert(m_last_shown_suggestion.trailing_trivia); insert(m_last_shown_suggestion.trailing_trivia);
m_last_shown_suggestion_display_length += m_last_shown_suggestion.trailing_trivia.length();
if (m_tab_direction == TabDirection::Forward) if (m_tab_direction == TabDirection::Forward)
increment_suggestion_index(); increment_suggestion_index();
else else