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

ensure bookmarks can be shown in top hits #818

Merged
merged 9 commits into from
May 23, 2024
Merged

ensure bookmarks can be shown in top hits #818

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c44b25
ensure bookmarks can be shown in top hits
brindy May 10, 2024
30eef8f
Merge branch 'main' into brindy/autocomplete-swiftui
brindy May 15, 2024
f61b24b
Merge branch 'main' into brindy/autocomplete-swiftui
brindy May 16, 2024
8f41299
Merge branch 'main' into brindy/autocomplete-swiftui
brindy May 17, 2024
4a39129
call clean with todays date instead trying to use entries which might…
brindy May 17, 2024
c5faa4f
see if unit test line number reported changes
brindy May 20, 2024
5a6a30a
wait for burn all to finish before asserting
brindy May 20, 2024
cd348c3
Merge branch 'main' into brindy/autocomplete-swiftui
brindy May 21, 2024
0be71b7
Merge branch 'main' into brindy/autocomplete-swiftui
brindy May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Sources/Suggestions/SuggestionProcessing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,18 @@ final class SuggestionProcessing {
if case .bookmark = $0, $0.url?.naked == nakedUrl { return true }
return false
}), case let Suggestion.bookmark(title: title, url: url, isFavorite: isFavorite, allowedInTopHits: _) = newSuggestion {
#if os(macOS)
// Copy allowedInTopHits from original suggestion
return Suggestion.bookmark(title: title,
url: url,
isFavorite: isFavorite,
allowedInTopHits: historySuggestion.allowedInTopHits)
#else
return Suggestion.bookmark(title: title,
url: url,
isFavorite: isFavorite,
allowedInTopHits: true)
#endif
} else {
return nil
}
Expand All @@ -178,10 +185,17 @@ final class SuggestionProcessing {
if case .historyEntry = $0, $0.url?.naked == nakedUrl { return true }
return false
}), historySuggestion.allowedInTopHits {
#if os(macOS)
return Suggestion.bookmark(title: title,
url: url,
isFavorite: isFavorite,
allowedInTopHits: historySuggestion.allowedInTopHits)
#else
return Suggestion.bookmark(title: title,
url: url,
isFavorite: isFavorite,
allowedInTopHits: true)
#endif
} else {
return nil
}
Expand Down
Loading