Rename SourceKitDef to UID.

Makefile

@@ -86,9 +86,9 @@ docker_test_4:
 	docker run -v `pwd`:`pwd` -w `pwd` --rm norionomura/swift:40 swift test
 
 generate_sourcekit_defines:
-	clang -E -P Templates/TypeDefs.h -o Templates/SourceKitDef.swift
-	sourcery --sources Templates/SourceKitDef.swift --templates Templates/AutoEnumNameFix.stencil --output Templates/SourceKitDef.swift
-	mv Templates/SourceKitDef.swift Source/SourceKittenFramework
+	clang -E -P Templates/TypeDefs.h -o Templates/UID.swift
+	sourcery --sources Templates/UID.swift --templates Templates/AutoEnumNameFix.stencil --output Templates/UID.swift
+	mv Templates/UID.swift Source/SourceKittenFramework
 
 # http://irace.me/swift-profiling/
 display_compilation_time:

Source/SourceKittenFramework/RequestBuilder.swift

@@ -14,13 +14,13 @@ import SourceKit
 public class RequestBuilder {
     private var dict: [sourcekitd_uid_t: sourcekitd_object_t] = [:]
 
-    public init(type: SourceKitDef.Request) {
-        dict[transform(key: "key.request")] = sourcekitd_request_uid_create(transform(key: type.stringRepresentation))
+    public init(type: UID.Request) {
+        dict[transform(key: "key.request")] = sourcekitd_request_uid_create(transform(key: type.description))
     }
 
-    public subscript(_ key: SourceKitDef.Key) -> Any? {
-        get { return dict[transform(key: key.stringRepresentation)] }
-        set { set(newValue, for: key.stringRepresentation) }
+    public subscript(_ key: UID.Key) -> Any? {
+        get { return dict[transform(key: key.description)] }
+        set { set(newValue, for: key.description) }
     }
 
     public func makeRequest() -> sourcekitd_object_t {

Source/SourceKittenFramework/Requests/Request+CursorInfo.swift

@@ -38,7 +38,7 @@ extension Request {
             requestBuilder[.name] = name
             requestBuilder[.sourceFile] = sourceFile
             requestBuilder[.cancelOnSubsequentRequest] = cancelOnSubsequentRequest
-            requestBuilder[.uSR] = location.usr
+            requestBuilder[.usr] = location.usr
             requestBuilder[.offset] = location.offset
             requestBuilder[.length] = location.length
             requestBuilder[.retrieveRefactorActions] = location.retrieveRefactorActions

Source/SourceKittenFramework/Requests/Request+EditorFindUSR.swift

@@ -17,7 +17,7 @@ extension Request {
         public func sourcekitObject() -> sourcekitd_object_t {
             let requestBuilder = RequestBuilder(type: .editorFindUSR)
             requestBuilder[.sourceFile] = sourceFile
-            requestBuilder[.uSR] = usr
+            requestBuilder[.usr] = usr
             return requestBuilder.makeRequest()
         }
     }