Skip to content

[sourcekitd] Add an option to completion request to sort results #258

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 1 commit into from
Mar 27, 2020
Merged

[sourcekitd] Add an option to completion request to sort results #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,10 @@ extension SwiftLanguageServer {
skreq[keys.sourcefile] = snapshot.document.uri.pseudoPath
skreq[keys.sourcetext] = snapshot.text

let skreqOptions = SKRequestDictionary(sourcekitd: self.sourcekitd)
skreqOptions[keys.codecomplete_sort_byname] = 1
skreq[keys.codecomplete_options] = skreqOptions

// FIXME: SourceKit should probably cache this for us.
if let settings = self.buildSettingsByFile[snapshot.document.uri] {
skreq[keys.compilerargs] = settings.compilerArguments
Expand Down
4 changes: 4 additions & 0 deletions Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ struct sourcekitd_keys {
let text: sourcekitd_uid_t

// Code Completion related keys.
let codecomplete_options: sourcekitd_uid_t
let codecomplete_sort_byname: sourcekitd_uid_t
let context: sourcekitd_uid_t
let doc: sourcekitd_uid_t
let not_recommended: sourcekitd_uid_t
Expand Down Expand Up @@ -294,6 +296,8 @@ struct sourcekitd_keys {
text = api.uid_get_from_cstr("key.text")!

// Code Completion related keys.
codecomplete_options = api.uid_get_from_cstr("key.codecomplete.options")!
codecomplete_sort_byname = api.uid_get_from_cstr("key.codecomplete.sort.byname")!
context = api.uid_get_from_cstr("key.context")!
doc = api.uid_get_from_cstr("key.doc.brief")!
not_recommended = api.uid_get_from_cstr("key.not_recommended")!
Expand Down