Update formatter

Motivation:

We need to use a newer version of SwiftFormat on the async/await code.
First we should update main so that merging changes into the async
branch is cleaner.

Modifications:

- Update SwiftFormat
- Reformat

Result:

Our version of SwiftFormat is new enough to correctly handle async/await
code.

Author: glbrntt

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: "Formatting and License Headers check"
       run: |
-        SWIFTFORMAT_VERSION=0.46.3
+        SWIFTFORMAT_VERSION=0.49.4
         git clone --depth 1 --branch "$SWIFTFORMAT_VERSION" "https://github.com/nicklockwood/SwiftFormat" "$HOME/SwiftFormat"
         swift build --package-path "$HOME/SwiftFormat" --product swiftformat
         export PATH=$PATH:"$(swift build --package-path "$HOME/SwiftFormat" --show-bin-path)"

.swiftformat

@@ -37,3 +37,6 @@
 
 # Don't prefer using key paths for trivial closures.
 --disable preferKeyPath
+
+# Put ACLs on declarations within an extension rather than the extension itself.
+--extensionacl on-declarations

Examples/Google/NaturalLanguage/Sources/main.swift

@@ -56,7 +56,7 @@ func getAuthToken(
   do {
     try provider.withToken { token, error in
       if let token = token,
-        let accessToken = token.AccessToken {
+         let accessToken = token.AccessToken {
         promise.succeed(accessToken)
       } else if let error = error {
         promise.fail(error)

Examples/Google/SpeechToText/Sources/Launch/SceneDelegate.swift

@@ -35,7 +35,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     self.navController?.navigationBar.prefersLargeTitles = false
 
     let viewController: UIViewController = ViewController()
-    navController?.pushViewController(viewController, animated: false)
+    self.navController?.pushViewController(viewController, animated: false)
 
     self.window = UIWindow(windowScene: windowScene)
     self.window!.rootViewController = self.navController

Examples/Google/SpeechToText/Sources/SpeechService.swift

@@ -66,8 +66,10 @@ final class SpeechService {
     )
   }
 
-  func stream(_ data: Data,
-              completion: ((Google_Cloud_Speech_V1_StreamingRecognizeResponse) -> Void)? = nil) {
+  func stream(
+    _ data: Data,
+    completion: ((Google_Cloud_Speech_V1_StreamingRecognizeResponse) -> Void)? = nil
+  ) {
     switch self.state {
     case .idle:
       // Initialize the bidirectional stream

Examples/Google/SpeechToText/Sources/ViewController.swift

@@ -56,8 +56,10 @@ final class ViewController: UIViewController {
   private let speechService: SpeechService
   private let audioStreamManager: AudioStreamManager
 
-  init(speechService: SpeechService,
-       audioStreamManager: AudioStreamManager) {
+  init(
+    speechService: SpeechService,
+    audioStreamManager: AudioStreamManager
+  ) {
     self.speechService = speechService
     self.audioStreamManager = audioStreamManager
 

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/AsyncPingPongRequestMaker.swift

@@ -39,11 +39,13 @@ final class AsyncPingPongRequestMaker: RequestMaker {
   ///    - requestMessage: Pre-made request message to use possibly repeatedly.
   ///    - logger: Where to log useful diagnostics.
   ///    - stats: Where to record statistics on latency.
-  init(config: Grpc_Testing_ClientConfig,
-       client: Grpc_Testing_BenchmarkServiceClient,
-       requestMessage: Grpc_Testing_SimpleRequest,
-       logger: Logger,
-       stats: StatsWithLock) {
+  init(
+    config: Grpc_Testing_ClientConfig,
+    client: Grpc_Testing_BenchmarkServiceClient,
+    requestMessage: Grpc_Testing_SimpleRequest,
+    logger: Logger,
+    stats: StatsWithLock
+  ) {
     self.client = client
     self.requestMessage = requestMessage
     self.logger = logger
@@ -70,7 +72,7 @@ final class AsyncPingPongRequestMaker: RequestMaker {
       let endTime = grpcTimeNow()
       self.stats.add(latency: endTime - startTime)
       if !self.stopRequested,
-        self.messagesPerStream == 0 || messagesSent < self.messagesPerStream {
+         self.messagesPerStream == 0 || messagesSent < self.messagesPerStream {
         messagesSent += 1
         startTime = endTime // Use end of previous request as the start of the next.
         streamingCall!.sendMessage(self.requestMessage, promise: nil)

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/AsyncUnaryRequestMaker.swift

@@ -32,11 +32,13 @@ final class AsyncUnaryRequestMaker: RequestMaker {
   ///    - requestMessage: Pre-made request message to use possibly repeatedly.
   ///    - logger: Where to log useful diagnostics.
   ///    - stats: Where to record statistics on latency.
-  init(config: Grpc_Testing_ClientConfig,
-       client: Grpc_Testing_BenchmarkServiceClient,
-       requestMessage: Grpc_Testing_SimpleRequest,
-       logger: Logger,
-       stats: StatsWithLock) {
+  init(
+    config: Grpc_Testing_ClientConfig,
+    client: Grpc_Testing_BenchmarkServiceClient,
+    requestMessage: Grpc_Testing_SimpleRequest,
+    logger: Logger,
+    stats: StatsWithLock
+  ) {
     self.client = client
     self.requestMessage = requestMessage
     self.logger = logger

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/BenchmarkServiceImpl.swift

@@ -24,8 +24,10 @@ final class AsyncQPSServerImpl: Grpc_Testing_BenchmarkServiceProvider {
 
   /// One request followed by one response.
   /// The server returns the client payload as-is.
-  func unaryCall(request: Grpc_Testing_SimpleRequest,
-                 context: StatusOnlyCallContext) -> EventLoopFuture<Grpc_Testing_SimpleResponse> {
+  func unaryCall(
+    request: Grpc_Testing_SimpleRequest,
+    context: StatusOnlyCallContext
+  ) -> EventLoopFuture<Grpc_Testing_SimpleResponse> {
     do {
       return context.eventLoop
         .makeSucceededFuture(try AsyncQPSServerImpl.processSimpleRPC(request: request))
@@ -93,8 +95,10 @@ final class AsyncQPSServerImpl: Grpc_Testing_BenchmarkServiceProvider {
   }
 
   /// Make a payload for sending back to the client.
-  private static func makePayload(type: Grpc_Testing_PayloadType,
-                                  size: Int) throws -> Grpc_Testing_Payload {
+  private static func makePayload(
+    type: Grpc_Testing_PayloadType,
+    size: Int
+  ) throws -> Grpc_Testing_Payload {
     if type != .compressable {
       // Making a payload which is not compressable is hard - and not implemented in
       // other implementations too.

Performance/QPSBenchmark/Sources/QPSBenchmark/Runtime/RequestMaker.swift

@@ -27,11 +27,13 @@ protocol RequestMaker {
   ///    - requestMessage: Pre-made request message to use possibly repeatedly.
   ///    - logger: Where to log useful diagnostics.
   ///    - stats: Where to record statistics on latency.
-  init(config: Grpc_Testing_ClientConfig,
-       client: Grpc_Testing_BenchmarkServiceClient,
-       requestMessage: Grpc_Testing_SimpleRequest,
-       logger: Logger,
-       stats: StatsWithLock)
+  init(
+    config: Grpc_Testing_ClientConfig,
+    client: Grpc_Testing_BenchmarkServiceClient,
+    requestMessage: Grpc_Testing_SimpleRequest,
+    logger: Logger,
+    stats: StatsWithLock
+  )
 
   /// Initiate a request sequence to the server.
   /// - returns: A future which completes when the request-response sequence is complete.