mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-11 18:50:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibLine: Correctly slice completion substrings as unicode strings

Browse source 
Ports a fix from Serenity's LibLine.
cee0d979cc
This commit is contained in:
Ali Mohammad Pur 2024-09-19 15:25:17 +02:00 • committed by Tim Flynn
commit 5ac0e81c4a
Notes: github-actions[bot] 2024-09-20 10:58:01 +00:00
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibLine/Editor.cpp
View file

@ -383,7 +383,13 @@ void Editor::insert(ByteString const& string)
void Editor::insert(StringView string_view) void Editor::insert(StringView string_view)
{ {
for (auto ch : Utf8View { string_view }) auto view = Utf8View { string_view };
insert(view);
}
void Editor::insert(Utf8View& view)
{
for (auto ch : view)
insert(ch); insert(ch);
} }
@ -1205,7 +1211,7 @@ ErrorOr<void> Editor::handle_read_event()
m_chars_touched_in_the_middle++; m_chars_touched_in_the_middle++;
for (auto& view : completion_result.insert) for (auto& view : completion_result.insert)
insert(view.as_string()); insert(view);
auto stderr_stream = TRY(Core::File::standard_error()); auto stderr_stream = TRY(Core::File::standard_error());
TRY(reposition_cursor(*stderr_stream)); TRY(reposition_cursor(*stderr_stream));

1
Userland/Libraries/LibLine/Editor.h
View file

@ -218,6 +218,7 @@ public:
void clear_line(); void clear_line();
void insert(ByteString const&); void insert(ByteString const&);
void insert(StringView); void insert(StringView);
void insert(Utf8View&);
void insert(Utf32View const&); void insert(Utf32View const&);
void insert(u32 const); void insert(u32 const);
void stylize(Span const&, Style const&); void stylize(Span const&, Style const&);

8
Userland/Libraries/LibLine/SuggestionManager.cpp
View file

@ -141,14 +141,14 @@ SuggestionManager::CompletionAttemptResult SuggestionManager::attempt_completion
if (mode == CompletePrefix) { if (mode == CompletePrefix) {
// Only auto-complete *if possible*. // Only auto-complete *if possible*.
if (can_complete) { if (can_complete) {
result.insert.append(suggestion.text_view().substring_view(suggestion.invariant_offset, m_largest_common_suggestion_prefix_length - suggestion.invariant_offset)); result.insert.append(suggestion.text_view().unicode_substring_view(suggestion.invariant_offset, m_largest_common_suggestion_prefix_length - suggestion.invariant_offset));
m_last_shown_suggestion_display_length = m_largest_common_suggestion_prefix_length; m_last_shown_suggestion_display_length = m_largest_common_suggestion_prefix_length;
// Do not increment the suggestion index, as the first tab should only be a *peek*. // Do not increment the suggestion index, as the first tab should only be a *peek*.
if (m_suggestions.size() == 1) { if (m_suggestions.size() == 1) {
// If there's one suggestion, commit and forget. // If there's one suggestion, commit and forget.
result.new_completion_mode = DontComplete; result.new_completion_mode = DontComplete;
// Add in the trivia of the last selected suggestion. // Add in the trivia of the last selected suggestion.
result.insert.append(suggestion.trivia_view()); result.insert.append(suggestion.trailing_trivia.code_points());
m_last_shown_suggestion_display_length = 0; m_last_shown_suggestion_display_length = 0;
result.style_to_apply = suggestion.style; result.style_to_apply = suggestion.style;
m_last_shown_suggestion_was_complete = true; m_last_shown_suggestion_was_complete = true;
@ -161,9 +161,9 @@ SuggestionManager::CompletionAttemptResult SuggestionManager::attempt_completion
m_last_shown_suggestion_was_complete = false; m_last_shown_suggestion_was_complete = false;
m_last_shown_suggestion = ByteString::empty(); m_last_shown_suggestion = ByteString::empty();
} else { } else {
result.insert.append(suggestion.text_view().substring_view(suggestion.invariant_offset, suggestion.text_view().length() - suggestion.invariant_offset)); result.insert.append(suggestion.text_view().unicode_substring_view(suggestion.invariant_offset, suggestion.text_view().length() - suggestion.invariant_offset));
// Add in the trivia of the last selected suggestion. // Add in the trivia of the last selected suggestion.
result.insert.append(suggestion.trivia_view()); result.insert.append(suggestion.trailing_trivia.code_points());
m_last_shown_suggestion_display_length += suggestion.trivia_view().length(); m_last_shown_suggestion_display_length += suggestion.trivia_view().length();
} }
} else { } else {