BugFix: Should Open Default Suggestion on Search Bar when Nothing is Selected #1232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
veloman-yunkan
requested changes
Oct 30, 2024
ShaopengLin
force-pushed
the
Issue#1230-suggestion-enter-press
branch
from
ad2e2b3
to
e7e8a1f
Compare
veloman-yunkan
requested changes
Oct 30, 2024
src/searchbar.cpp
Outdated
| @@ -332,12 +340,13 @@ void SearchBarLineEdit::fetchSuggestions(NewSuggestionHandlerFuncPtr callback) | |||
| const int start = m_suggestionModel.countOfRegularSuggestions(); | |||
| const auto suggestionWorker = new SuggestionListWorker(m_searchbarInput, m_token, start, this); | |||
| connect(suggestionWorker, &SuggestionListWorker::searchFinished, this, | |||
| [=] (const QList<SuggestionData>& suggestionList, int token) { | |||
| [=] (const QList<SuggestionData>& suggestionList, const QString& text, int token) { | |||
There was a problem hiding this comment.
You could have passed the search text as a captured value of the lambda. But your implementation drew my attention to the not so self-explaining token/m_token thing. Let's improve the design as follows:
- Replace
int SearchBarLineEdit::m_tokenwithQString SearchBarLineEdit::m_suggestionWereRequestedFor(or maybe we can instead reuse the existingm_searchbarInputdata member?) - Get rid of the
tokenparameter insearchFinished()signal ofSuggestionListWorker- use the newtextparameter instead (BTW, the latter better be renamed tosearchTextand moved to the beginning of the parameter list).
There was a problem hiding this comment.
@veloman-yunkan Removing the temporal variable m_token might introduce a race condition bug:
- user type "i", and suggestions are retrived.
- user trigger fetch more.
- user further type to "i am", and new suggestions are triggered.
- user immediately types back to "i", and the fetch more from 2. returns from asynchronous call back.
- the insertion order can be raced, and m_completer.complete() is not called before fetch more.
There was a problem hiding this comment.
Good analysis! You are a shrewd antiracist! :)
ShaopengLin
force-pushed
the
Issue#1230-suggestion-enter-press
branch
from
e7e8a1f
to
ad5d6af
Compare
ShaopengLin
force-pushed
the
Issue#1230-suggestion-enter-press
branch
from
ad5d6af
to
3ee0993
Compare
src/searchbar.cpp
Outdated
| @@ -313,9 +322,8 @@ void SearchBarLineEdit::onInitialSuggestions(int) | |||
| m_completer.complete(getCompleterRect()); | |||
|
|
|||
| /* Make row 0 appear but do not highlight it */ | |||
There was a problem hiding this comment.
Is this comment still valid?
ShaopengLin
force-pushed
the
Issue#1230-suggestion-enter-press
branch
from
3ee0993
to
1ea0222
Compare
Search Bar opens the default suggestion when user did not select any suggestions and presses enter.
ShaopengLin
force-pushed
the
Issue#1230-suggestion-enter-press
branch
from
1ea0222
to
94b991e
Compare
veloman-yunkan
approved these changes
Nov 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #1230
Two potential implementations listed here:
Open default suggestions whenever enter is pressed on an invalid index. Added 'relevant' search bar input checker to avoid race conditions. 2929d91
Similar approach as before Implement Endless Zim Search Suggestions #1224, where we check text in search bar matches the suggestion text before opening. ad2e2b3
I am leaning toward the first one since it is a much cleaner change.