Merge pull request swiftlang#258 from rintaro/sourcekitd-completion-optionalsort-rdar60799439

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

Author: rintaro

Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift

@@ -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

Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift

@@ -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
@@ -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")!