Merge pull request swiftlang#18 from yhkaplan/cleanup-syntax

Cleanup syntax

Author: benlangmuir

Sources/LanguageServerProtocol/Request.swift

@@ -41,7 +41,6 @@ public final class Request<R: RequestType> {
   public let cancellationToken: CancellationToken
 
   public init(_ request: Params, id: RequestID, clientID: ObjectIdentifier, cancellation: CancellationToken, reply: @escaping (LSPResult<Response>) -> ()) {
-
     self.id = id
     self.clientID = clientID
     self.params = request

Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift

@@ -48,9 +48,9 @@ public final class JSONRPCConection {
   /// The set of currently outstanding outgoing requests along with information about how to decode and handle their responses.
   var outstandingRequests: [RequestID: OutstandingRequest] = [:]
 
-  var closeHandler: () -> ()
+  var closeHandler: () -> Void
 
-  public init(inFD: Int32, outFD: Int32, closeHandler: @escaping () -> () = {}) {
+  public init(inFD: Int32, outFD: Int32, closeHandler: @escaping () -> Void = {}) {
     state = .created
     self.closeHandler = closeHandler
 

Sources/SKCore/Toolchain.swift

@@ -118,6 +118,7 @@ extension Toolchain {
   }
 
   /// Search `path` for tools, returning true if any are found.
+  @discardableResult
   func searchForTools(_ path: AbsolutePath, _ fs: FileSystem = localFileSystem) -> Bool {
     return
       searchForTools(binPath: path, fs) ||

Sources/SKSupport/Cancellation.swift

@@ -17,7 +17,7 @@ public final class CancellationToken {
 
   public init() {}
 
-  public func addCancellationHandler(_ handler: @escaping () -> ()) {
+  public func addCancellationHandler(_ handler: @escaping () -> Void) {
 
   }
 

Sources/SKSupport/Platform.swift

@@ -18,7 +18,7 @@ extension Platform {
   public var dynamicLibraryExtension: String {
     switch self {
     case .darwin: return "dylib"
-    case .linux(_): return "so"
+    case .linux: return "so"
     }
   }
 }

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -67,7 +67,7 @@ public final class SwiftPMWorkspace {
     self.packageRoot = packageRoot
     self.fs = fileSystem
 
-    guard var swiftpmToolchain = toolchainRegistry.swiftpmHost else {
+    guard var swiftpmToolchain = toolchainRegistry.swiftPMHost else {
       throw Error.cannotDetermineHostToolchain
     }
 
@@ -244,7 +244,7 @@ extension SwiftPMWorkspace {
         workingDirectory: workspacePath.asString
       )
 
-    case (.clang(_), .swift):
+    case (.clang, .swift):
       return nil
 
     case (.clang(let td), _):
@@ -309,13 +309,12 @@ extension SwiftPMWorkspace {
   }
 
   func packageDescriptionSettings(_ path: AbsolutePath) -> FileBuildSettings? {
-    for package in packageGraph.packages {
-      if path == package.manifest.path {
+    for package in packageGraph.packages where path == package.manifest.path {
+        let compilerArgs = workspace.interpreterFlags(for: package.path) + [path.asString]
         return FileBuildSettings(
           preferredToolchain: nil,
-          compilerArguments:
-            workspace.interpreterFlags(for: package.path) + [path.asString])
-      }
+          compilerArguments: compilerArgs
+        )
     }
     return nil
   }
@@ -348,7 +347,7 @@ private struct SwiftPMToolchain: Build.Toolchain, ManifestResourceProvider {
 extension ToolchainRegistry {
 
   /// A toolchain appropriate for using to load swiftpm manifests.
-  fileprivate var swiftpmHost: SwiftPMToolchain? {
+  fileprivate var swiftPMHost: SwiftPMToolchain? {
     var swiftc: AbsolutePath? = self.default?.swiftc
     var clang: AbsolutePath? = self.default?.clang
     if swiftc == nil {

Sources/SourceKit/SourceKitServer.swift

@@ -38,10 +38,10 @@ public final class SourceKitServer: LanguageServer {
 
   let fs: FileSystem
 
-  let onExit: () -> ()
+  let onExit: () -> Void
 
   /// Creates a language server for the given client.
-  public init(client: Connection, fileSystem: FileSystem = localFileSystem, onExit: @escaping () -> () = {}) {
+  public init(client: Connection, fileSystem: FileSystem = localFileSystem, onExit: @escaping () -> Void = {}) {
 
     self.fs = fileSystem
     self.toolchainRegistry = ToolchainRegistry.shared

Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift

@@ -26,15 +26,15 @@ public final class SwiftLanguageServer: LanguageServer {
   // FIXME: ideally we wouldn't need separate management from a parent server in the same process.
   var documentManager: DocumentManager
 
-  let onExit: () -> ()
+  let onExit: () -> Void
 
   var api: sourcekitd_functions_t { return sourcekitd.api }
   var keys: sourcekitd_keys { return sourcekitd.keys }
   var requests: sourcekitd_requests { return sourcekitd.requests }
   var values: sourcekitd_values { return sourcekitd.values }
 
   /// Creates a language server for the given client using the sourcekitd dylib at the specified path.
-  public init(client: Connection, sourcekitd: AbsolutePath, buildSystem: BuildSystem, onExit: @escaping () -> () = {}) throws {
+  public init(client: Connection, sourcekitd: AbsolutePath, buildSystem: BuildSystem, onExit: @escaping () -> Void = {}) throws {
 
     self.sourcekitd = try SwiftSourceKitFramework(dylib: sourcekitd)
     self.buildSystem = buildSystem
@@ -328,7 +328,7 @@ extension SwiftLanguageServer {
 
       var result = CompletionList(isIncomplete: false, items: [])
 
-      let cancelled = !completions.forEach({ (i, value) -> Bool in
+      let cancelled = !completions.forEach { (i, value) -> Bool in
         // Check for cancellation periodically when there are many results.
         if i % 100 == 0, req.isCancelled {
           req.reply(LSPResult.failure(.cancelled))
@@ -357,7 +357,7 @@ extension SwiftLanguageServer {
         ))
 
         return true
-      })
+      }
 
       if !cancelled {
         req.reply(result)
@@ -527,7 +527,7 @@ extension SwiftLanguageServer {
 
       var highlights: [DocumentHighlight] = []
 
-      results.forEach { i, value in
+      results.forEach { _, value in
         if let offset: Int = value[self.keys.offset],
            let start: Position = snapshot.positionOf(utf8Offset: offset),
            let length: Int = value[self.keys.length],

Sources/sourcekit-lsp/main.swift

@@ -24,7 +24,7 @@ let clientConnection = JSONRPCConection(inFD: STDIN_FILENO, outFD: STDOUT_FILENO
   exit(0)
 })
 
-Logger.shared.addLogHandler { message, level in
+Logger.shared.addLogHandler { message, _ in
   clientConnection.send(LogMessage(type: .log, message: message))
 }
 

Tests/LanguageServerProtocolJSONRPCTests/ConnectionPerfTests.swift

@@ -32,7 +32,7 @@ class ConnectionPerfTests: XCTestCase {
     self.measureMetrics([.wallClockTime], automaticallyStartMeasuring: false) {
       let expectation = self.expectation(description: "response received")
       self.startMeasuring()
-      _ = client.send(EchoRequest(string: "hello!")) { resp in
+      _ = client.send(EchoRequest(string: "hello!")) { _ in
         self.stopMeasuring()
         expectation.fulfill()
       }
@@ -46,7 +46,7 @@ class ConnectionPerfTests: XCTestCase {
     let sema = DispatchSemaphore(value: 0)
     self.measure {
       for _ in 1...100 {
-        _ = client.send(EchoRequest(string: "hello!")) { resp in
+        _ = client.send(EchoRequest(string: "hello!")) { _ in
           sema.signal()
         }
         XCTAssertEqual(sema.wait(timeout: .now() + .seconds(10)), .success)
@@ -59,7 +59,7 @@ class ConnectionPerfTests: XCTestCase {
     let sema = DispatchSemaphore(value: 0)
     self.measure {
       DispatchQueue.concurrentPerform(iterations: 100, execute: { _ in
-        _ = client.send(EchoRequest(string: "hello!")) { resp in
+        _ = client.send(EchoRequest(string: "hello!")) { _ in
           sema.signal()
         }
       })