Sorted list of content selectors#7458
Merged
Merged
Conversation
…r, including the check if suggestions are in alphabetical order
…oving fields and keywords as well as check if keywords are in alphabetical order
Siedlerchr
reviewed
Feb 21, 2021
| existingKeywords.add(keywordToAdd); | ||
| existingKeywords.sort(Comparator.naturalOrder()); | ||
| fieldKeywordsMap.put(field, existingKeywords); | ||
| keywords.add(keywordToAdd); |
Member
There was a problem hiding this comment.
Can you please explain why this is removed?
Contributor
Author
There was a problem hiding this comment.
On the next line we call populateKeywords which clears the keywords and then populates it with keywords from fieldKeywordsMap. Since it makes no difference if we add to keywords at this point I simply deleted this line.
Member
There was a problem hiding this comment.
Ah thanks for the clarification!
Member
|
Thanks, in general looks good to me, just one question and please have a look at the failing checkstyle test |
Siedlerchr
approved these changes
Feb 21, 2021
calixtus
approved these changes
Feb 22, 2021
calixtus
left a comment
Member
There was a problem hiding this comment.
Looks good to me too. Thanks!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
List of keywords added in "Manage content selectors" is now always displayed in alphabetic order. Also added tests for ContentSelectorSuggestionProvider and ContentSelectorDialogViewModel classes which include asserting alphabetical order in suggestions affected by content selectors as well.
Fixes #3791.
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)