Skip to content

Commit c895b2a

Browse files
committed
Improve selectedResultPossibleSuggestion check logic
1 parent 0638362 commit c895b2a

File tree

1 file changed

+27
-5
lines changed

1 file changed

+27
-5
lines changed

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,34 @@ values[2] is not string queryText ||
3333
{
3434
var selectedResult = selectedItem.Result;
3535
var selectedResultActionKeyword = string.IsNullOrEmpty(selectedResult.ActionKeywordAssigned) ? "" : selectedResult.ActionKeywordAssigned + " ";
36-
var selectedResultPossibleSuggestion = selectedResultActionKeyword +
37-
(string.IsNullOrEmpty(selectedResult.QuerySuggestionText) ?
38-
selectedResult.Title :
39-
selectedResult.QuerySuggestionText);
4036

41-
if (!selectedResultPossibleSuggestion.StartsWith(queryText, StringComparison.CurrentCultureIgnoreCase))
37+
string selectedResultPossibleSuggestion = null;
38+
39+
// Firstly check if the result has QuerySuggestionText
40+
if (!string.IsNullOrEmpty(selectedResult.QuerySuggestionText))
41+
{
42+
selectedResultPossibleSuggestion = selectedResultActionKeyword + selectedResult.QuerySuggestionText;
43+
44+
// If this QuerySuggestionText does not start with the queryText, set it to null
45+
if (!selectedResultPossibleSuggestion.StartsWith(queryText, StringComparison.CurrentCultureIgnoreCase))
46+
{
47+
selectedResultPossibleSuggestion = null;
48+
}
49+
}
50+
51+
// Then check Title as suggestion
52+
if (string.IsNullOrEmpty(selectedResultPossibleSuggestion))
53+
{
54+
selectedResultPossibleSuggestion = selectedResultActionKeyword + selectedResult.Title;
55+
56+
// If this QuerySuggestionText does not start with the queryText, set it to null
57+
if (!selectedResultPossibleSuggestion.StartsWith(queryText, StringComparison.CurrentCultureIgnoreCase))
58+
{
59+
selectedResultPossibleSuggestion = null;
60+
}
61+
}
62+
63+
if (string.IsNullOrEmpty(selectedResultPossibleSuggestion))
4264
return string.Empty;
4365

4466
// For AutocompleteQueryCommand.

0 commit comments

Comments
 (0)