[WIP] Introduce SourcekitVariant

.swiftlint.yml

@@ -7,6 +7,7 @@ excluded:
   - Source/SourceKittenFramework/library_wrapper_Documentation.swift
   - Source/SourceKittenFramework/library_wrapper_Index.swift
   - Source/SourceKittenFramework/library_wrapper_sourcekitd.swift
+  - Source/SourceKittenFramework/UIDNamespace+generated.swift
 opt_in_rules:
   - attributes
   - closure_end_indentation

CHANGELOG.md

@@ -134,6 +134,12 @@
   [JP Simard](https://github.com/jpsim)
   [Norio Nomura](https://github.com/norio-nomura)
 
+* Some APIs changed to `throws`.  
+  * `File.format(trimmingTrailingWhitespace:useTabs:indentWidth:) throws`
+  * `Structure.init(file:) throws`
+  * `SyntaxMap.init(file:) throws`
+  [Norio Nomura](https://github.com/norio-nomura)
+
 ##### Enhancements
 
 * Add `--spm-module [ModuleName]` flag to `complete` to automatically detect

Source/SourceKittenFramework/Clang+SourceKitten.swift

@@ -200,17 +200,20 @@ extension CXCursor {
             swiftUUID = NSUUID().uuidString
             setUUIDString(uidString: swiftUUID, for: file)
             // Generate Swift interface, associating it with the UUID
-            _ = Request.interface(file: file, uuid: swiftUUID).send()
+            guard let _ = try? Request.interface(file: file, uuid: swiftUUID).failableSend() else {
+                return nil
+            }
         }
 
         guard let usr = usr(),
-              let usrOffset = Request.findUSR(file: swiftUUID, usr: usr).send()[SwiftDocKey.offset.rawValue] as? Int64 else {
+            let findUSR = try? Request.findUSR(file: swiftUUID, usr: usr).failableSend(),
+            let usrOffset = findUSR.offset else {
             return nil
         }
 
-        let cursorInfo = Request.cursorInfo(file: swiftUUID, offset: usrOffset, arguments: compilerArguments).send()
-        guard let docsXML = cursorInfo[SwiftDocKey.fullXMLDocs.rawValue] as? String,
-              let swiftDeclaration = SWXMLHash.parse(docsXML).children.first?["Declaration"].element?.text else {
+        guard let cursorInfo = try? Request.cursorInfo(file: swiftUUID, offset: usrOffset, arguments: compilerArguments).failableSend(),
+            let docsXML = cursorInfo.docFullAsXML,
+            let swiftDeclaration = SWXMLHash.parse(docsXML).children.first?["Declaration"].element?.text else {
                 return nil
         }
         return swiftDeclaration

Source/SourceKittenFramework/CodeCompletionItem.swift

@@ -17,12 +17,6 @@ fileprivate extension Dictionary {
 }
 
 public struct CodeCompletionItem: CustomStringConvertible {
-    #if os(Linux)
-    public typealias NumBytesInt = Int
-    #else
-    public typealias NumBytesInt = Int64
-    #endif
-
     public let kind: String
     public let context: String
     public let name: String?
@@ -32,7 +26,7 @@ public struct CodeCompletionItem: CustomStringConvertible {
     public let moduleName: String?
     public let docBrief: String?
     public let associatedUSRs: String?
-    public let numBytesToErase: NumBytesInt?
+    public let numBytesToErase: Int?
 
     /// Dictionary representation of CodeCompletionItem. Useful for NSJSONSerialization.
     public var dictionaryValue: [String: Any] {
@@ -49,30 +43,29 @@ public struct CodeCompletionItem: CustomStringConvertible {
     }
 
     public var description: String {
-        return toJSON(dictionaryValue.bridge())
+        return toJSON(dictionaryValue)
     }
 
-    public static func parse(response: [String: SourceKitRepresentable]) -> [CodeCompletionItem] {
-        return (response["key.results"] as! [SourceKitRepresentable]).map { item in
-            let dict = item as! [String: SourceKitRepresentable]
-            return CodeCompletionItem(kind: dict["key.kind"] as! String,
-                context: dict["key.context"] as! String,
-                name: dict["key.name"] as? String,
-                descriptionKey: dict["key.description"] as? String,
-                sourcetext: dict["key.sourcetext"] as? String,
-                typeName: dict["key.typename"] as? String,
-                moduleName: dict["key.modulename"] as? String,
-                docBrief: dict["key.doc.brief"] as? String,
-                associatedUSRs: dict["key.associated_usrs"] as? String,
-                numBytesToErase: dict["key.num_bytes_to_erase"] as? NumBytesInt)
-        }
+    public static func parse(response: SourceKitVariant) -> [CodeCompletionItem] {
+        return response.results?.map { dict in
+            return CodeCompletionItem(kind: dict.kind?.description ?? "",
+                context: dict.context!,
+                name: dict.name,
+                descriptionKey: dict.description,
+                sourcetext: dict.sourceText,
+                typeName: dict.typeName,
+                moduleName: dict.moduleName,
+                docBrief: dict.docBrief,
+                associatedUSRs: dict.associatedUsrs,
+                numBytesToErase: dict["key.num_bytes_to_erase"]?.int)
+        } ?? []
     }
 }
 
 // MARK: - migration support
 extension CodeCompletionItem {
     @available(*, unavailable, renamed: "parse(response:)")
-    public static func parseResponse(_ response: [String: SourceKitRepresentable]) -> [CodeCompletionItem] {
+    public static func parseResponse(_ response: [String: Any]) -> [CodeCompletionItem] {
         fatalError()
     }
 }