Run swift-format over the CandidateUI package

Author: lukhnos

Packages/CandidateUI/Package.swift

@@ -9,7 +9,7 @@ let package = Package(
     products: [
         .library(
             name: "CandidateUI",
-            targets: ["CandidateUI"]),
+            targets: ["CandidateUI"])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.

Packages/CandidateUI/Sources/CandidateUI/CandidateController.swift

@@ -38,10 +38,15 @@ public class CandidateKeyLabel: NSObject {
 @objc(VTCandidateControllerDelegate)
 public protocol CandidateControllerDelegate: AnyObject {
     func candidateCountForController(_ controller: CandidateController) -> UInt
-    func candidateController(_ controller: CandidateController, candidateAtIndex index: UInt) -> String
-    func candidateController(_ controller: CandidateController, readingAtIndex index: UInt) -> String?
-    func candidateController(_ controller: CandidateController, requestExplanationFor candidate: String, reading: String) -> String?
-    func candidateController(_ controller: CandidateController, didSelectCandidateAtIndex index: UInt)
+    func candidateController(_ controller: CandidateController, candidateAtIndex index: UInt)
+        -> String
+    func candidateController(_ controller: CandidateController, readingAtIndex index: UInt)
+        -> String?
+    func candidateController(
+        _ controller: CandidateController, requestExplanationFor candidate: String, reading: String
+    ) -> String?
+    func candidateController(
+        _ controller: CandidateController, didSelectCandidateAtIndex index: UInt)
 }
 
 @objc(VTCandidateController)
@@ -90,9 +95,10 @@ public class CandidateController: NSWindowController {
         }
     }
 
-    @objc public var keyLabels: [CandidateKeyLabel] = ["1", "2", "3", "4", "5", "6", "7", "8", "9"].map {
-        CandidateKeyLabel(key: $0, displayedText: $0)
-    }
+    @objc public var keyLabels: [CandidateKeyLabel] = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+        .map {
+            CandidateKeyLabel(key: $0, displayedText: $0)
+        }
 
     @objc public var keyLabelFont: NSFont = .systemFont(ofSize: 14)
     @objc public var candidateFont: NSFont = .systemFont(ofSize: 18)
@@ -131,9 +137,11 @@ public class CandidateController: NSWindowController {
     ///   - height: The height that helps the window not to be out of the bottom
     ///     of a screen.
     @objc(setWindowTopLeftPoint:bottomOutOfScreenAdjustmentHeight:)
-    public func set(windowTopLeftPoint: NSPoint, bottomOutOfScreenAdjustmentHeight height: CGFloat) {
+    public func set(windowTopLeftPoint: NSPoint, bottomOutOfScreenAdjustmentHeight height: CGFloat)
+    {
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()) {
-            self.doSet(windowTopLeftPoint: windowTopLeftPoint, bottomOutOfScreenAdjustmentHeight: height)
+            self.doSet(
+                windowTopLeftPoint: windowTopLeftPoint, bottomOutOfScreenAdjustmentHeight: height)
         }
     }
 
@@ -145,9 +153,9 @@ public class CandidateController: NSWindowController {
         for screen in NSScreen.screens {
             let frame = screen.visibleFrame
             if windowTopLeftPoint.x >= frame.minX,
-               windowTopLeftPoint.x <= frame.maxX,
-               windowTopLeftPoint.y >= frame.minY,
-               windowTopLeftPoint.y <= frame.maxY
+                windowTopLeftPoint.x <= frame.maxX,
+                windowTopLeftPoint.y >= frame.minY,
+                windowTopLeftPoint.y <= frame.maxY
             {
                 screenFrame = frame
                 break

Packages/CandidateUI/Sources/CandidateUI/HorizontalCandidateController.swift

@@ -24,7 +24,9 @@
 import Cocoa
 
 private protocol HorizontalCandidateViewDelegate: AnyObject {
-    func view(_ view: HorizontalCandidateView, didRequestExplanationFor candidate: String, reading: String) -> String?
+    func view(
+        _ view: HorizontalCandidateView, didRequestExplanationFor candidate: String, reading: String
+    ) -> String?
 }
 
 private class HorizontalCandidateView: NSView {
@@ -38,9 +40,10 @@ private class HorizontalCandidateView: NSView {
         let reading: String?
         let rect: NSRect
 
-        init(owner: HorizontalCandidateView, index: UInt,
-             candidate: String, reading: String?, rect: NSRect)
-        {
+        init(
+            owner: HorizontalCandidateView, index: UInt,
+            candidate: String, reading: String?, rect: NSRect
+        ) {
             self.owner = owner
             self.index = index
             self.candidate = candidate
@@ -132,14 +135,17 @@ private class HorizontalCandidateView: NSView {
         return result
     }
 
-    func set(keyLabels labels: [String], displayedCandidates candidates: [(candidate:String, reading: String?)]) {
+    func set(
+        keyLabels labels: [String],
+        displayedCandidates candidates: [(candidate: String, reading: String?)]
+    ) {
         let count = min(labels.count, candidates.count)
-        keyLabels = Array(labels[0 ..< count])
-        displayedCandidates = Array(candidates[0 ..< count])
+        keyLabels = Array(labels[0..<count])
+        displayedCandidates = Array(candidates[0..<count])
 
         var newWidths = [CGFloat]()
         let baseSize = NSSize(width: 10240.0, height: 10240.0)
-        for index in 0 ..< count {
+        for index in 0..<count {
             let labelRect = (keyLabels[index] as NSString).boundingRect(
                 with: baseSize, options: .usesLineFragmentOrigin, attributes: keyLabelAttrDict
             )
@@ -222,7 +228,7 @@ private class HorizontalCandidateView: NSView {
         }
 
         var accuWidth: CGFloat = 0
-        for index in 0 ..< elementWidths.count {
+        for index in 0..<elementWidths.count {
             let currentWidth = elementWidths[index]
             let labelRect = NSRect(
                 x: accuWidth, y: tooltipSize.height, width: currentWidth, height: keyLabelHeight
@@ -280,7 +286,7 @@ private class HorizontalCandidateView: NSView {
             return nil
         }
         var accuWidth: CGFloat = 0.0
-        for index in 0 ..< elementWidths.count {
+        for index in 0..<elementWidths.count {
             let currentWidth = elementWidths[index]
 
             if location.x >= accuWidth, location.x <= accuWidth + currentWidth {
@@ -330,12 +336,13 @@ private class HorizontalCandidateView: NSView {
     fileprivate func buildAccessibilityChildren() {
         func accessibilityFrameForCandidate(at index: Int) -> NSRect {
             var accuWidth: CGFloat = 0
-            for i in 0 ..< index {
+            for i in 0..<index {
                 accuWidth += elementWidths[i] + 1.0
             }
             let width = elementWidths[index]
             let height = keyLabelHeight + candidateTextHeight + 1.0
-            let rectInView = NSRect(x: accuWidth, y: tooltipSize.height, width: width, height: height)
+            let rectInView = NSRect(
+                x: accuWidth, y: tooltipSize.height, width: width, height: height)
             return rectInView
         }
 
@@ -554,7 +561,9 @@ public class HorizontalCandidateController: CandidateController {
 }
 
 extension HorizontalCandidateController: HorizontalCandidateViewDelegate {
-    fileprivate func view(_ view: HorizontalCandidateView, didRequestExplanationFor candidate: String, reading: String) -> String? {
+    fileprivate func view(
+        _ view: HorizontalCandidateView, didRequestExplanationFor candidate: String, reading: String
+    ) -> String? {
         delegate?.candidateController(self, requestExplanationFor: candidate, reading: reading)
     }
 }
@@ -580,12 +589,13 @@ extension HorizontalCandidateController {
         let keyLabelCount = UInt(keyLabels.count)
 
         let begin = currentPage * keyLabelCount
-        for index in begin ..< min(begin + keyLabelCount, count) {
+        for index in begin..<min(begin + keyLabelCount, count) {
             let candidate = delegate.candidateController(self, candidateAtIndex: index)
             let reading = delegate.candidateController(self, readingAtIndex: index)
             candidates.append((candidate, reading))
         }
-        candidateView.set(keyLabels: keyLabels.map { $0.displayedText }, displayedCandidates: candidates)
+        candidateView.set(
+            keyLabels: keyLabels.map { $0.displayedText }, displayedCandidates: candidates)
         candidateView.toolTip = tooltip
         var newSize = candidateView.sizeForView
         var frameRect = candidateView.frame