OSDN Git Service

swiftlint 'opening_brace'の警告を修正
authormasakih <masakih@users.sourceforge.jp>
Tue, 14 Mar 2017 13:50:18 +0000 (22:50 +0900)
committermasakih <masakih@users.sourceforge.jp>
Tue, 14 Mar 2017 13:50:18 +0000 (22:50 +0900)
.swiftlint.yml
KCD/AnchorageRepairManager.swift
KCD/AppDelegate.swift
KCD/CacheStoragePolicy.swift
KCD/CustomHTTPProtocol.swift
KCD/MissionStatus.swift
KCD/PeriodicNotifier.swift
KCD/RemodelSlotItemCommand.swift
KCD/ScreenshotListWindowController.swift
KCD/Ship.swift

index 0c61298..6eaa89a 100644 (file)
@@ -5,7 +5,6 @@ disabled_rules:
     - cyclomatic_complexity
     - trailing_comma
     - function_parameter_count
-    - opening_brace
     - todo
     - trailing_whitespace
 file_length:
index 6ef3bbc..d08c84f 100644 (file)
@@ -56,26 +56,30 @@ class AnchorageRepairManager: NSObject {
     private func needsReset(info: HenseiDidChangeUserInfo) -> Bool {
         // 変更のあった艦隊の旗艦は工作艦か?
         if let flagShipType = shipTypeId(fleetNumber: info.fleetNumber, position: 0),
-            repairShipTypeIds.contains(flagShipType)
-        { return true }
+            repairShipTypeIds.contains(flagShipType) {
+            return true
+        }
         if info.type == .replace,
             let replaceFleet = info.replaceFleetNumber,
             let flagShipType = shipTypeId(fleetNumber: replaceFleet, position: 0),
-            repairShipTypeIds.contains(flagShipType)
-        { return true }
+            repairShipTypeIds.contains(flagShipType) {
+            return true
+        }
         
         // 変更のあった艦娘は工作艦か?
         //     旗艦から外れたか?
         if info.type == .remove || info.type == .append,
             let shipType = shipTypeId(shipId: info.shipID),
-            repairShipTypeIds.contains(shipType)
-        { return info.position == 0 }
+            repairShipTypeIds.contains(shipType) {
+            return info.position == 0
+        }
         if info.type == .replace,
             let shipId = info.replaceShipID,
             let shipType = shipTypeId(shipId: shipId),
             repairShipTypeIds.contains(shipType),
-            let replacePos = info.replacePosition
-        { return replacePos == 0 }
+            let replacePos = info.replacePosition {
+            return replacePos == 0
+        }
         
         return false
     }
index a57fd24..d402244 100644 (file)
@@ -170,10 +170,11 @@ class AppDelegate: NSObject {
             .addObserver(forName: .NSWindowWillClose,
                          object: browser.window,
                          queue: nil) { [unowned self] notification in
-                NotificationCenter.default.removeObserver(token)
-                if let obj = notification.object as? NSWindow,
-                    let index = self.browserWindowControllers.index(where: { $0.window == obj })
-                { self.browserWindowControllers.remove(at: index) }
+                            NotificationCenter.default.removeObserver(token)
+                            if let obj = notification.object as? NSWindow,
+                                let index = self.browserWindowControllers.index(where: { $0.window == obj }) {
+                                self.browserWindowControllers.remove(at: index)
+                            }
         }
         return browser
     }
index 491f95b..38b44fb 100644 (file)
@@ -36,16 +36,16 @@ private func cacheable(request: URLRequest) -> Bool {
 
 private func policy(request: URLRequest) -> URLCache.StoragePolicy {
     if let scheme = request.url?.scheme?.lowercased(),
-        scheme == "https"
-    { return .allowedInMemoryOnly }
+        scheme == "https" {
+        return .allowedInMemoryOnly
+    }
     return .allowed
 }
 
 func CacheStoragePolicy(for request: URLRequest, response: HTTPURLResponse) -> URLCache.StoragePolicy {
     if cacheable(status: response.statusCode),
         cacheable(response: response),
-        cacheable(request: request)
-    {
+        cacheable(request: request) {
         return policy(request: request)
     }
     return .notAllowed
index f75a624..1156464 100644 (file)
@@ -31,8 +31,9 @@ class CustomHTTPProtocol: URLProtocol {
     override class func canInit(with request: URLRequest) -> Bool {
         if let _ = property(forKey: requestProperty, in: request) { return false }
         if let scheme = request.url?.scheme?.lowercased(),
-            (scheme == "http" || scheme == "https")
-        { return true }
+            (scheme == "http" || scheme == "https") {
+            return true
+        }
         return false
     }
     override class func canonicalRequest(for request: URLRequest) -> URLRequest {
@@ -68,8 +69,7 @@ class CustomHTTPProtocol: URLProtocol {
         if let cache = CustomHTTPProtocol.kcdURLCache.cachedResponse(for: request),
             let info = cache.userInfo,
             let expires = info["Expires"] as? Date,
-            Date().compare(expires) == .orderedAscending
-        {
+            Date().compare(expires) == .orderedAscending {
             use(cache)
             if let name = request.url?.lastPathComponent {
                 Debug.print("Use cache for", name, level: .full)
@@ -138,8 +138,7 @@ extension CustomHTTPProtocol: URLSessionDataDelegate {
     func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
         if let error = error {
             if canRetry(error: error as NSError),
-                let request = task.originalRequest
-            {
+                let request = task.originalRequest {
                 didRetry = true
                 dataTask = session.dataTask(with: request)
                 dataTask?.resume()
@@ -159,8 +158,7 @@ extension CustomHTTPProtocol: URLSessionDataDelegate {
             CustomHTTPProtocol.cachedExtensions.contains(ext),
             let request = task.originalRequest,
             let response = task.response as? HTTPURLResponse,
-            let expires = response.expires()
-        {
+            let expires = response.expires() {
             let cache = CachedURLResponse(response: response,
                                           data: data,
                                           userInfo: ["Expires": expires],
@@ -183,13 +181,11 @@ extension HTTPURLResponse {
             let s = cc[range.upperBound..<cc.endIndex]
                 .components(separatedBy: ",")
                 .first,
-            let age = TimeInterval(s)
-        {
+            let age = TimeInterval(s) {
             return Date(timeIntervalSinceNow: age)
         }
         if let ex = (allHeaderFields["Expires"] as? String)?.lowercased(),
-            let exp = httpDateFormatter.date(from: ex)
-        {
+            let exp = httpDateFormatter.date(from: ex) {
             return exp
         }
         return nil
index 4cce635..2ed0e72 100644 (file)
@@ -49,7 +49,7 @@ class MissionStatus: NSObject {
         guard let state = state as? Int,
             let stat = State(rawValue: state)
             else { return print("unknown State") }
-        if stat == .none || stat == .finish  {
+        if stat == .none || stat == .finish {
             if stat == .none { didNotify = false }
             name = nil
             time = nil
index badec77..3eb2f92 100644 (file)
@@ -47,8 +47,7 @@ class PeriodicNotifier: NSObject {
         currentDay.hour = hour
         currentDay.minute = minutes
         if let notifyDate = Calendar.current.date(from: currentDay),
-            now.compare(notifyDate) == .orderedDescending
-        {
+            now.compare(notifyDate) == .orderedDescending {
             currentDay.day? += 1
             NotificationCenter.default.post(name: .Periodic, object: self)
         }
index 14a2d95..cdfa79c 100644 (file)
@@ -30,8 +30,7 @@ class RemodelSlotItemCommand: JSONCommand {
         }
         if let masterSlotItemId = afterSlot["api_slotitem_id"] as? Int,
             masterSlotItemId != slotItem.slotitem_id,
-            let masterSlotItem = store.masterSlotItem(by: slotItemId)
-        {
+            let masterSlotItem = store.masterSlotItem(by: slotItemId) {
             slotItem.master_slotItem = masterSlotItem
             slotItem.slotitem_id = slotItemId
         }
index 3458df8..d39d6ad 100644 (file)
@@ -14,14 +14,17 @@ class ScreenshotListWindowController: NSWindowController {
     @IBOutlet weak var left: NSView!
     @IBOutlet weak var right: NSView!
     
-    private lazy var detailViewController: ScreenshotDetailViewController =
-        { return ScreenshotDetailViewController() }()
-    private var editorViewController: ScreenshotEditorViewController =
-        { return ScreenshotEditorViewController() }()
+    private lazy var detailViewController: ScreenshotDetailViewController = {
+        return ScreenshotDetailViewController()
+    }()
+    private var editorViewController: ScreenshotEditorViewController = {
+            return ScreenshotEditorViewController()
+    }()
     private var viewControllers: [NSViewController] = []
     fileprivate weak var currentRightViewController: BridgeViewController?
-    fileprivate lazy var listViewController: ScreenshotListViewController =
-        { return ScreenshotListViewController() }()
+    fileprivate lazy var listViewController: ScreenshotListViewController = {
+            return ScreenshotListViewController()
+    }()
     
     var filterPredicate: NSPredicate? = nil {
         didSet {
index 408d72a..568f13f 100644 (file)
@@ -409,8 +409,9 @@ extension Ship {
         if itemId == -1 { return .notEquip(maxCount) }
         
         if let item = slotItem(index),
-            allPlaneTypes.contains(item.master_slotItem.type_2)
-        { return .equiped(slotItemCount(index), maxCount) }
+            allPlaneTypes.contains(item.master_slotItem.type_2) {
+            return .equiped(slotItemCount(index), maxCount)
+        }
         return .notEquip(maxCount)
     }
     private func planeString(_ index: Int) -> String? {