Merge pull request swiftlang#38 from abdullahselek/master

Prefer Void over ().

Author: benlangmuir

Sources/LanguageServerProtocol/Connection.swift

@@ -19,7 +19,7 @@ public protocol Connection: AnyObject {
   func send<Notification>(_: Notification) where Notification: NotificationType
 
   /// Send a request and (asynchronously) receive a reply.
-  func send<Request>(_: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> ()) -> RequestID where Request: RequestType
+  func send<Request>(_: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType
 
   /// Send a request synchronously. **Use wisely**.
   func sendSync<Request>(_: Request) throws -> Request.Response where Request: RequestType
@@ -51,7 +51,7 @@ public protocol MessageHandler: AnyObject {
   func handle<Notification>(_: Notification, from: ObjectIdentifier) where Notification: NotificationType
 
   /// Handle a request and (asynchronously) receive a reply.
-  func handle<Request>(_: Request, id: RequestID, from: ObjectIdentifier, reply: @escaping (LSPResult<Request.Response>) -> ()) where Request: RequestType
+  func handle<Request>(_: Request, id: RequestID, from: ObjectIdentifier, reply: @escaping (LSPResult<Request.Response>) -> Void) where Request: RequestType
 }
 
 /// A connection between two message handlers in the same process.
@@ -114,7 +114,7 @@ extension LocalConnection: Connection {
     handler!.handle(notification, from: ObjectIdentifier(self))
   }
 
-  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> ()) -> RequestID where Request: RequestType {
+  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
     precondition(state == .started)
     let id = nextRequestID()
     handler!.handle(request, id: id, from: ObjectIdentifier(self)) { result in

Sources/LanguageServerProtocol/LanguageServer.swift

@@ -103,7 +103,7 @@ extension LanguageServerEndpoint {
   /// Register the given request handler, which must be a method on `self`.
   ///
   /// Must be called on `queue`.
-  public func _register<Server, R>(_ requestHandler: @escaping (Server) -> (Request<R>) -> ()) {
+  public func _register<Server, R>(_ requestHandler: @escaping (Server) -> (Request<R>) -> Void) {
     // We can use `unowned` here because the handler is run synchronously on `queue`.
     precondition(self is Server)
     requestHandlers[ObjectIdentifier(R.self)] = { [unowned self] request in
@@ -114,7 +114,7 @@ extension LanguageServerEndpoint {
   /// Register the given notification handler, which must be a method on `self`.
   ///
   /// Must be called on `queue`.
-  public func _register<Server, N>(_ noteHandler: @escaping (Server) -> (Notification<N>) -> ()) {
+  public func _register<Server, N>(_ noteHandler: @escaping (Server) -> (Notification<N>) -> Void) {
     // We can use `unowned` here because the handler is run synchronously on `queue`.
     notificationHandlers[ObjectIdentifier(N.self)] = { [unowned self] note in
       noteHandler(self as! Server)(note)
@@ -124,24 +124,24 @@ extension LanguageServerEndpoint {
   /// Register the given request handler.
   ///
   /// Must be called on `queue`.
-  public func _register<R>(_ requestHandler: @escaping (Request<R>) -> ()) {
+  public func _register<R>(_ requestHandler: @escaping (Request<R>) -> Void) {
     requestHandlers[ObjectIdentifier(R.self)] = requestHandler
   }
 
   /// Register the given notification handler.
   ///
   /// Must be called on `queue`.
-  public func _register<N>(_ noteHandler: @escaping (Notification<N>) -> ()) {
+  public func _register<N>(_ noteHandler: @escaping (Notification<N>) -> Void) {
     notificationHandlers[ObjectIdentifier(N.self)] = noteHandler
   }
 
   /// Register the given request handler.  **For test messages only**.
-  public func register<R>(_ requestHandler: @escaping (Request<R>) -> ()) {
+  public func register<R>(_ requestHandler: @escaping (Request<R>) -> Void) {
     queue.sync { _register(requestHandler) }
   }
 
   /// Register the given notification handler.  **For test messages only**.
-  public func register<N>(_ noteHandler: @escaping (Notification<N>) -> ()) {
+  public func register<N>(_ noteHandler: @escaping (Notification<N>) -> Void) {
     queue.sync { _register(noteHandler) }
   }
 }
@@ -157,15 +157,15 @@ extension LanguageServerEndpoint: MessageHandler {
 
       self._logNotification(notification)
 
-      guard let handler = self.notificationHandlers[ObjectIdentifier(N.self)] as? ((Notification<N>) -> ()) else {
+      guard let handler = self.notificationHandlers[ObjectIdentifier(N.self)] as? ((Notification<N>) -> Void) else {
         self._handleUnknown(notification)
         return
       }
       handler(notification)
     }
   }
 
-  public func handle<R>(_ params: R, id: RequestID, from clientID: ObjectIdentifier, reply: @escaping (LSPResult<R.Response >) -> ()) where R: RequestType {
+  public func handle<R>(_ params: R, id: RequestID, from clientID: ObjectIdentifier, reply: @escaping (LSPResult<R.Response >) -> Void) where R: RequestType {
 
     queue.async {
 
@@ -182,7 +182,7 @@ extension LanguageServerEndpoint: MessageHandler {
 
       self._logRequest(request)
 
-      guard let handler = self.requestHandlers[ObjectIdentifier(R.self)] as? ((Request<R>) -> ()) else {
+      guard let handler = self.requestHandlers[ObjectIdentifier(R.self)] as? ((Request<R>) -> Void) else {
         self._handleUnknown(request)
         return
       }

Sources/LanguageServerProtocol/Request.swift

@@ -28,7 +28,7 @@ public final class Request<R: RequestType> {
   /// The request parameters.
   public let params: Params
 
-  private var replyBlock: (LSPResult<Response>) -> ()
+  private var replyBlock: (LSPResult<Response>) -> Void
 
   /// Whether a reply has been made. Every request must reply exactly once.
   private var replied: Bool = false {
@@ -40,7 +40,7 @@ public final class Request<R: RequestType> {
   /// The request's cancellation state.
   public let cancellationToken: CancellationToken
 
-  public init(_ request: Params, id: RequestID, clientID: ObjectIdentifier, cancellation: CancellationToken, reply: @escaping (LSPResult<Response>) -> ()) {
+  public init(_ request: Params, id: RequestID, clientID: ObjectIdentifier, cancellation: CancellationToken, reply: @escaping (LSPResult<Response>) -> Void) {
     self.id = id
     self.clientID = clientID
     self.params = request

Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift

@@ -42,7 +42,7 @@ public final class JSONRPCConection {
     var requestType: _RequestType.Type
     var responseType: ResponseType.Type
     var queue: DispatchQueue
-    var replyHandler: (LSPResult<Any>) -> ()
+    var replyHandler: (LSPResult<Any>) -> Void
   }
 
   /// The set of currently outstanding outgoing requests along with information about how to decode and handle their responses.
@@ -296,7 +296,7 @@ extension JSONRPCConection: _IndirectConnection {
     }
   }
 
-  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> ()) -> RequestID where Request: RequestType {
+  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
 
     let id: RequestID = self.queue.sync {
       let id = nextRequestID()

Sources/SKSupport/Logging.swift

@@ -100,7 +100,7 @@ public final class Logger {
   }
 
   @discardableResult
-  public func addLogHandler(_ handler: @escaping (String, LogLevel) -> ()) -> AnyLogHandler {
+  public func addLogHandler(_ handler: @escaping (String, LogLevel) -> Void) -> AnyLogHandler {
     let obj = AnyLogHandler(handler)
     addLogHandler(obj)
     return obj
@@ -165,9 +165,9 @@ public final class Logger {
 
 public class AnyLogHandler: LogHandler {
 
-  let handler: (String, LogLevel) -> ()
+  let handler: (String, LogLevel) -> Void
 
-  public init(_ handler: @escaping (String, LogLevel) -> ()) {
+  public init(_ handler: @escaping (String, LogLevel) -> Void) {
     self.handler = handler
   }
 

Sources/SKTestSupport/CheckCoding.swift

@@ -67,7 +67,7 @@ public func checkDecoding<T>(json: String, expected value: T, file: StaticString
   XCTAssertEqual(value, decodedValue, file: file, line: line)
 }
 
-public func checkCoding<T>(_ value: T, json: String, userInfo: [CodingUserInfoKey: Any] = [:], file: StaticString = #file, line: UInt = #line, body: (T) -> ()) where T: Codable {
+public func checkCoding<T>(_ value: T, json: String, userInfo: [CodingUserInfoKey: Any] = [:], file: StaticString = #file, line: UInt = #line, body: (T) -> Void) where T: Codable {
   let encoder = JSONEncoder()
   encoder.outputFormatting.insert(.prettyPrinted)
   if #available(macOS 10.13, *) {

Sources/SKTestSupport/TestJSONRPCConnection.swift

@@ -93,11 +93,11 @@ public final class TestClient: LanguageServerEndpoint {
   }
 
   public var replyQueue: DispatchQueue = DispatchQueue(label: "testclient-reply-queue")
-  var oneShotNotificationHandlers: [((Any) -> ())] = []
+  var oneShotNotificationHandlers: [((Any) -> Void)] = []
 
   public var allowUnexpectedNotification: Bool = false
 
-  public func appendOneShotNotificationHandler<N>(_ handler: @escaping (Notification<N>) -> ()) {
+  public func appendOneShotNotificationHandler<N>(_ handler: @escaping (Notification<N>) -> Void) {
     oneShotNotificationHandlers.append({ anyNote in
       guard let note = anyNote as? Notification<N> else {
         fatalError("received notification of the wrong type \(anyNote); expected \(N.self)")
@@ -106,7 +106,7 @@ public final class TestClient: LanguageServerEndpoint {
     })
   }
 
-  public func handleNextNotification<N>(_ handler: @escaping (Notification<N>) -> ()) {
+  public func handleNextNotification<N>(_ handler: @escaping (Notification<N>) -> Void) {
     precondition(oneShotNotificationHandlers.isEmpty)
     appendOneShotNotificationHandler(handler)
   }
@@ -137,12 +137,12 @@ extension TestClient: Connection {
   }
 
   /// Send a request to the language server and (asynchronously) receive a reply.
-  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> ()) -> RequestID where Request: RequestType {
+  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
     return server.send(request, queue: queue, reply: reply)
   }
 
   /// Convenience method to get reply on replyQueue.
-  public func send<Request>(_ request: Request, reply: @escaping (LSPResult<Request.Response>) -> ()) -> RequestID where Request: RequestType {
+  public func send<Request>(_ request: Request, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
     return send(request, queue: replyQueue, reply: reply)
   }
 
@@ -152,7 +152,7 @@ extension TestClient: Connection {
 
   /// Send a notification and expect a notification in reply synchronously.
   /// For testing notifications that behave like requests  - e.g. didChange & publishDiagnostics.
-  public func sendNoteSync<NSend, NReply>(_ notification: NSend, _ handler: @escaping (Notification<NReply>) -> ()) where NSend: NotificationType {
+  public func sendNoteSync<NSend, NReply>(_ notification: NSend, _ handler: @escaping (Notification<NReply>) -> Void) where NSend: NotificationType {
 
     let expectation = XCTestExpectation(description: "sendNoteSync - note received")
 
@@ -173,8 +173,8 @@ extension TestClient: Connection {
   /// For testing notifications that behave like requests  - e.g. didChange & publishDiagnostics.
   public func sendNoteSync<NSend, NReply1, NReply2>(
     _ notification: NSend,
-    _ handler1: @escaping (Notification<NReply1>) -> (),
-    _ handler2: @escaping (Notification<NReply2>) -> ()
+    _ handler1: @escaping (Notification<NReply1>) -> Void,
+    _ handler2: @escaping (Notification<NReply2>) -> Void
   ) where NSend: NotificationType {
 
     let expectation = XCTestExpectation(description: "sendNoteSync - note received")

Sources/SourceKit/DocumentManager.swift

@@ -95,7 +95,7 @@ public final class DocumentManager {
   /// - returns: The contents of the file after all the edits are applied.
   /// - throws: Error.missingDocument if the document is not open.
   @discardableResult
-  public func edit(_ url: URL, newVersion: Int, edits: [TextDocumentContentChangeEvent], editCallback: ((_ before: DocumentSnapshot, TextDocumentContentChangeEvent) -> ())? = nil) throws -> DocumentSnapshot {
+  public func edit(_ url: URL, newVersion: Int, edits: [TextDocumentContentChangeEvent], editCallback: ((_ before: DocumentSnapshot, TextDocumentContentChangeEvent) -> Void)? = nil) throws -> DocumentSnapshot {
     return try queue.sync {
       guard let document = documents[url] else {
         throw Error.missingDocument(url)
@@ -159,7 +159,7 @@ extension DocumentManager {
 
   /// Convenience wrapper for `edit(_:newVersion:edits:editCallback:)` that logs on failure.
   @discardableResult
-  func edit(_ note: Notification<DidChangeTextDocument>, editCallback: ((_ before: DocumentSnapshot, TextDocumentContentChangeEvent) -> ())? = nil) -> DocumentSnapshot? {
+  func edit(_ note: Notification<DidChangeTextDocument>, editCallback: ((_ before: DocumentSnapshot, TextDocumentContentChangeEvent) -> Void)? = nil) -> DocumentSnapshot? {
     return orLog("failed to edit document", level: .error) {
       try edit(note.params.textDocument.url, newVersion: note.params.textDocument.version ?? -1, edits: note.params.contentChanges, editCallback: editCallback)
     }

Sources/SourceKit/SourceKitServer.swift

@@ -71,7 +71,7 @@ public final class SourceKitServer: LanguageServer {
   }
 
   func registerWorkspaceRequest<R>(
-    _ requestHandler: @escaping (SourceKitServer) -> (Request<R>, Workspace) -> ())
+    _ requestHandler: @escaping (SourceKitServer) -> (Request<R>, Workspace) -> Void)
   {
     _register { [unowned self] (req: Request<R>) in
       guard let workspace = self.workspace else {
@@ -83,7 +83,7 @@ public final class SourceKitServer: LanguageServer {
   }
 
   func registerWorkspaceNotfication<N>(
-    _ noteHandler: @escaping (SourceKitServer) -> (Notification<N>, Workspace) -> ())
+    _ noteHandler: @escaping (SourceKitServer) -> (Notification<N>, Workspace) -> Void)
   {
     _register { [unowned self] (note: Notification<N>) in
       guard let workspace = self.workspace else {

Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift

@@ -160,7 +160,7 @@ extension SwiftSourceKitFramework {
   }
 
   /// Send the given request and synchronously receive a reply dictionary (or error).
-  func send(_ req: SKRequestDictionary, reply: @escaping (LSPResult<SKResponseDictionary>) -> ()) -> sourcekitd_request_handle_t? {
+  func send(_ req: SKRequestDictionary, reply: @escaping (LSPResult<SKResponseDictionary>) -> Void) -> sourcekitd_request_handle_t? {
     logAsync { _ in req.description }
 
     var handle: sourcekitd_request_handle_t? = nil

Tests/LanguageServerProtocolTests/CodingTests.swift

@@ -199,7 +199,7 @@ final class CodingTests: XCTestCase {
   }
 }
 
-func with<T>(_ value: T, mutate: (inout T) -> ()) -> T {
+func with<T>(_ value: T, mutate: (inout T) -> Void) -> T {
   var localCopy = value
   mutate(&localCopy)
   return localCopy