Merge pull request #215 from ahoppen/shutdown-request

Rename Shutdown to ShutdownRequest

Author: ahoppen

Sources/LanguageServerProtocol/Messages.swift

@@ -17,7 +17,7 @@
 /// `MessageRegistry._register()` which allows you to avoid bloating the real server implementation.
 public let builtinRequests: [_RequestType.Type] = [
   InitializeRequest.self,
-  Shutdown.self,
+  ShutdownRequest.self,
   WorkspaceFoldersRequest.self,
   CompletionRequest.self,
   HoverRequest.self,

Sources/LanguageServerProtocol/Requests/ShutdownRequest.swift

@@ -16,9 +16,12 @@
 /// not reach the client). See `Exit`.
 ///
 /// - Returns: Void.
-public struct Shutdown: RequestType, Hashable {
+public struct ShutdownRequest: RequestType, Hashable {
   public static let method: String = "shutdown"
   public typealias Response = VoidResponse
 
   public init() { }
 }
+
+@available(*, deprecated, renamed: "ShutdownRequest")
+public typealias Shutdown = ShutdownRequest

Sources/SourceKit/SourceKitServer.swift

@@ -378,7 +378,7 @@ extension SourceKitServer {
   }
 
 
-  func shutdown(_ request: Request<Shutdown>) {
+  func shutdown(_ request: Request<ShutdownRequest>) {
     _prepareForExit()
     request.reply(VoidResponse())
   }

Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift

@@ -168,7 +168,7 @@ extension SwiftLanguageServer {
     // Nothing to do.
   }
 
-  func shutdown(_ request: Request<Shutdown>) {
+  func shutdown(_ request: Request<ShutdownRequest>) {
     api.set_notification_handler(nil)
   }
 

Tests/SourceKitTests/SourceKitTests.swift

@@ -136,7 +136,7 @@ final class SKTests: XCTestCase {
       XCTAssertEqual(versionContentsBefore.count, 1)
       XCTAssert(versionContentsBefore.first?.lastPathComponent.starts(with: "p") ?? false)
 
-      _ = try ws.sk.sendSync(Shutdown())
+      _ = try ws.sk.sendSync(ShutdownRequest())
       return versionedPath
     }