Skip to content

[Collections] Sort packages by name instead of identity #3599

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

Merged
merged 2 commits into from
Jul 9, 2021
Merged

[Collections] Sort packages by name instead of identity #3599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef727e
[Collections] Sort packages by name instead of identity
yim-lee Jul 9, 2021
579ec90
Use package identity as default instead of 'unknown'
yim-lee Jul 9, 2021
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
6 changes: 6 additions & 0 deletions Sources/PackageCollections/Model/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,3 +268,9 @@ extension PackageCollectionsModel.Package.Version {
self.manifests[self.defaultToolsVersion]
}
}

extension Model.Package {
var displayName: String {
self.latestVersion?.packageName ?? self.reference.identity.description
}
}
2 changes: 1 addition & 1 deletion Sources/PackageCollections/PackageCollections.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public struct PackageCollections: PackageCollectionsProtocol {
}

let result = PackageCollectionsModel.PackageSearchResult(
items: packageCollections.sorted { $0.key.identity < $1.key.identity }
items: packageCollections.sorted { $0.value.package.displayName < $1.value.package.displayName }
.map { entry in
.init(package: entry.value.package, collections: Array(entry.value.collections))
}
Expand Down
8 changes: 4 additions & 4 deletions Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable
}

// FTS results are not sorted by relevance at all (FTS5 supports ORDER BY rank but FTS4 requires additional SQL function)
// Sort by package identity for consistent ordering in results
let result = Model.PackageSearchResult(items: packageCollections.sorted { $0.key < $1.key }.map { entry in
// Sort by package name for consistent ordering in results
let result = Model.PackageSearchResult(items: packageCollections.sorted { $0.value.package.displayName < $1.value.package.displayName }.map { entry in
.init(package: entry.value.package, collections: Array(entry.value.collections))
})
callback(.success(result))
Expand Down Expand Up @@ -393,8 +393,8 @@ final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable
}
}

// Sort by package identity for consistent ordering in results
let result = Model.PackageSearchResult(items: packageCollections.sorted { $0.key.identity < $1.key.identity }.map { entry in
// Sort by package name for consistent ordering in results
let result = Model.PackageSearchResult(items: packageCollections.sorted { $0.value.package.displayName < $1.value.package.displayName }.map { entry in
.init(package: entry.value.package, collections: Array(entry.value.collections))
})
callback(.success(result))
Expand Down