Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

repair cask's fuzzy_search in search_casks #13048

Merged
merged 3 commits into from
Apr 4, 2022
Merged

repair cask's fuzzy_search in search_casks #13048

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94625d5
repair search_casks
hyuraku Mar 24, 2022
0758631
remove if condition
hyuraku Mar 28, 2022
e486c87
change the operator
hyuraku Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions Library/Homebrew/extend/os/mac/search.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ def search_casks(string_or_regex)
results = cask_tokens.extend(Searchable)
.search(string_or_regex)

if results.empty?
cask_names = Cask::Cask.all.map(&:full_name)
results = DidYouMean::SpellChecker.new(dictionary: cask_names).correct(string_or_regex)
end
cask_names = Cask::Cask.all.map(&:full_name)
results |= DidYouMean::SpellChecker.new(dictionary: cask_names)
.correct(string_or_regex)

results.sort.map do |name|
cask = Cask::CaskLoader.load(name)
Expand All @@ -48,7 +47,7 @@ def search_casks(string_or_regex)
else
cask.token
end
end
end.uniq
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
end.uniq
end

|= will already ensure uniqueness.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without uniq, the search results will show duplicate cask names. Because result will include the same cask's full_name and one's cask_tokens

brew/Library/Homebrew/extend/os/mac/search.rb

Line 43 in 0758631

results.sort.map do |name|

without uniq

brew search dockertoolbox
==> Formulae
docker-ls

==> Casks
docker-toolbox docker-toolbox

with uniq

brew search dockertoolbox
==> Formulae
docker-ls

==> Casks
docker-toolbox

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, in that case, what about doing += above given we're doing uniq here anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeMcQuaid
Could you review this PR?

end
end

Expand Down