Fixed swiftlint 0.23.0 warnings

Author: Anton Schukin

.swiftlint.yml

@@ -11,6 +11,6 @@ disabled_rules:
   - line_length
   - todo
   - type_body_length
-  - variable_name
+  - identifier_name
   - type_name
   - function_parameter_count

Chatto/Source/ChatController/BaseChatViewController+Changes.swift

@@ -197,14 +197,14 @@ extension BaseChatViewController: ChatDataSourceDelegateProtocol {
                     for move in changes.movedIndexPaths {
                         self.collectionView.moveItem(at: move.indexPathOld, to: move.indexPathNew)
                     }
-                }) { [weak self] (_) -> Void in
+                }, completion: { [weak self] (_) -> Void in
                     defer { myCompletion() }
                     guard let sSelf = self else { return }
                     sSelf.unfinishedBatchUpdatesCount -= 1
                     if sSelf.unfinishedBatchUpdatesCount == 0, let onAllBatchUpdatesFinished = self?.onAllBatchUpdatesFinished {
                         DispatchQueue.main.async(execute: onAllBatchUpdatesFinished)
                     }
-                }
+                })
             })
         } else {
             self.visibleCells = [:]
@@ -247,7 +247,7 @@ extension BaseChatViewController: ChatDataSourceDelegateProtocol {
             return self.createModelUpdates(
                 newItems: newItems,
                 oldItems: oldItems,
-                collectionViewWidth:collectionViewWidth)
+                collectionViewWidth: collectionViewWidth)
         }
 
         if performInBackground {

Chatto/Source/ChatController/Collaborators/KeyboardTracker.swift

@@ -219,7 +219,10 @@ private class KeyboardTrackingView: UIView {
         super.willMove(toSuperview: newSuperview)
     }
 
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+    override func observeValue(forKeyPath keyPath: String?,
+                               of object: Any?,
+                               change: [NSKeyValueChangeKey: Any]?,
+                               context: UnsafeMutableRawPointer?) {
         guard let object = object as? UIView, let superview = self.superview else { return }
         if object === superview {
             guard let sChange = change else { return }

Chatto/Tests/ChatController/CollectionChangesTests.swift

@@ -70,7 +70,7 @@ class CollectionChangesTests: XCTestCase {
             newCollection: [Item(uid: "a"), Item(uid: "c"), Item(uid: "b")]
         )
         XCTAssertEqual(changes.deletedIndexPaths, [])
-        XCTAssertEqual(Set(changes.movedIndexPaths), Set([Move(1, to: 2), Move(2, to:1)]))
+        XCTAssertEqual(Set(changes.movedIndexPaths), Set([Move(1, to: 2), Move(2, to: 1)]))
         XCTAssertEqual(changes.insertedIndexPaths, [])
     }
 
@@ -109,7 +109,9 @@ class CollectionChangesTests: XCTestCase {
             CollectionChangeMove(indexPathOld: indexPath4, indexPathNew: indexPath3)
         ]
 
-        let changes = CollectionChanges(insertedIndexPaths: insertions, deletedIndexPaths: deletions, movedIndexPaths:movements)
+        let changes = CollectionChanges(insertedIndexPaths: insertions,
+                                        deletedIndexPaths: deletions,
+                                        movedIndexPaths: movements)
         let result = updated(collection: collection, withChanges: changes)
 
         let expected = [

ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift

@@ -46,7 +46,10 @@ open class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHandl
     ViewModelBuilderT.ViewModelT: MessageViewModelProtocol,
     InteractionHandlerT: BaseMessageInteractionHandlerProtocol,
     InteractionHandlerT.ViewModelT == ViewModelBuilderT.ViewModelT,
-    BubbleViewT: UIView, BubbleViewT:MaximumLayoutWidthSpecificable, BubbleViewT: BackgroundSizingQueryable {
+    BubbleViewT: UIView,
+    BubbleViewT: MaximumLayoutWidthSpecificable,
+    BubbleViewT: BackgroundSizingQueryable {
+
     public typealias CellT = BaseMessageCollectionViewCell<BubbleViewT>
     public typealias ModelT = ViewModelBuilderT.ModelT
     public typealias ViewModelT = ViewModelBuilderT.ViewModelT

ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCell.swift

@@ -65,7 +65,10 @@ public struct BaseMessageCollectionViewCellLayoutConstants {
         - Have a BubbleViewType that responds properly to sizeThatFits:
 */
 
-open class BaseMessageCollectionViewCell<BubbleViewType>: UICollectionViewCell, BackgroundSizingQueryable, AccessoryViewRevealable, UIGestureRecognizerDelegate where BubbleViewType:UIView, BubbleViewType:MaximumLayoutWidthSpecificable, BubbleViewType: BackgroundSizingQueryable {
+open class BaseMessageCollectionViewCell<BubbleViewType>: UICollectionViewCell, BackgroundSizingQueryable, AccessoryViewRevealable, UIGestureRecognizerDelegate where
+    BubbleViewType: UIView,
+    BubbleViewType: MaximumLayoutWidthSpecificable,
+    BubbleViewType: BackgroundSizingQueryable {
 
     public var animationDuration: CFTimeInterval = 0.33
     open var viewContext: ViewContext = .normal

ChattoAdditions/Source/Chat Items/BaseMessage/Views/BaseMessageCollectionViewCellDefaultStyle.swift

@@ -121,7 +121,7 @@ open class BaseMessageCollectionViewCellDefaultStyle: BaseMessageCollectionViewC
     private lazy var dateFont: UIFont = self.dateTextStyle.font()
     private lazy var dateFontColor: UIColor = self.dateTextStyle.color()
 
-    private lazy var dateStringAttributes: [String : AnyObject] = {
+    private lazy var dateStringAttributes: [String: AnyObject] = {
         return [
             NSFontAttributeName: self.dateFont,
             NSForegroundColorAttributeName: self.dateFontColor

ChattoAdditions/Source/Chat Items/PhotoMessages/Views/PhotoBubbleView.swift

@@ -228,7 +228,10 @@ private class PhotoBubbleLayoutModel {
         }
 
         init(photoMessageViewModel model: PhotoMessageViewModelProtocol, style: PhotoBubbleViewStyleProtocol, containerWidth width: CGFloat) {
-            self.init(photoSize: style.bubbleSize(viewModel: model), tailWidth:style.tailWidth(viewModel: model), isIncoming: model.isIncoming, preferredMaxLayoutWidth: width)
+            self.init(photoSize: style.bubbleSize(viewModel: model),
+                      tailWidth: style.tailWidth(viewModel: model),
+                      isIncoming: model.isIncoming,
+                      preferredMaxLayoutWidth: width)
         }
     }
 

ChattoAdditions/Source/Input/ChatInputBarPresenter.swift

@@ -82,11 +82,9 @@ public class BasicChatInputBarPresenter: NSObject, ChatInputBarPresenter {
 
     fileprivate func firstKeyboardInputItem() -> ChatInputItemProtocol? {
         var firstKeyboardInputItem: ChatInputItemProtocol? = nil
-        for inputItem in self.chatInputItems {
-            if inputItem.presentationMode == .keyboard {
-                firstKeyboardInputItem = inputItem
-                break
-            }
+        for inputItem in self.chatInputItems where inputItem.presentationMode == .keyboard {
+            firstKeyboardInputItem = inputItem
+            break
         }
         return firstKeyboardInputItem
     }

ChattoAdditions/Source/Input/Photos/PhotosInputCameraPicker.swift

@@ -50,7 +50,7 @@ class PhotosInputCameraPicker: NSObject {
         let controller = UIImagePickerController()
         controller.delegate = self
         controller.sourceType = .camera
-        presentingController.present(controller, animated: true, completion:nil)
+        presentingController.present(controller, animated: true, completion: nil)
     }
 
     fileprivate func finishPickingImage(_ image: UIImage?, fromPicker picker: UIImagePickerController) {
@@ -61,7 +61,7 @@ class PhotosInputCameraPicker: NSObject {
 }
 
 extension PhotosInputCameraPicker: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingImage image: UIImage, editingInfo: [String : AnyObject]?) {
+    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingImage image: UIImage, editingInfo: [String: AnyObject]?) {
         self.finishPickingImage(image, fromPicker: picker)
     }
 

ChattoAdditions/Source/Input/Photos/PhotosInputCellProvider.swift

@@ -80,6 +80,6 @@ class PhotosInputCellProvider: PhotosInputCellProviderProtocol {
         }
         imageProvidedSynchronously = false
 
-        self.previewRequests.setObject(NSNumber(value: requestID), forKey:cell)
+        self.previewRequests.setObject(NSNumber(value: requestID), forKey: cell)
     }
 }

ChattoAdditions/Source/Input/ReusableXibView.swift

@@ -28,7 +28,7 @@ import UIKit
 
     func loadViewFromNib() -> UIView {
         let bundle = Bundle(for: type(of: self))
-        let nib = UINib(nibName:type(of: self).nibName(), bundle: bundle)
+        let nib = UINib(nibName: type(of: self).nibName(), bundle: bundle)
         let view = nib.instantiate(withOwner: nil, options: nil).first as! UIView
         return view
     }

ChattoAdditions/Source/Input/Text/TextChatInputItem.swift

@@ -54,7 +54,7 @@ open class TextChatInputItem {
 }
 
 // MARK: - ChatInputItemProtocol
-extension TextChatInputItem : ChatInputItemProtocol {
+extension TextChatInputItem: ChatInputItemProtocol {
     public var presentationMode: ChatInputItemPresentationMode {
         return .keyboard
     }

ChattoApp/ChattoApp/Source/FakeMessageFactory.swift

@@ -48,7 +48,7 @@ func createMessageModel(_ uid: String, isIncoming: Bool, type: String) -> Messag
 
 func createPhotoMessageModel(_ uid: String, image: UIImage, size: CGSize, isIncoming: Bool) -> DemoPhotoMessageModel {
     let messageModel = createMessageModel(uid, isIncoming: isIncoming, type: PhotoMessageModel<MessageModel>.chatItemType)
-    let photoMessageModel = DemoPhotoMessageModel(messageModel: messageModel, imageSize:size, image: image)
+    let photoMessageModel = DemoPhotoMessageModel(messageModel: messageModel, imageSize: size, image: image)
     return photoMessageModel
 }
 
@@ -85,8 +85,6 @@ class FakeMessageFactory {
             imageSize = CGSize(width: 400, height: 300)
         case 1:
             imageSize = CGSize(width: 300, height: 400)
-        case 2:
-            fallthrough
         default:
             imageSize = CGSize(width: 300, height: 300)
         }
@@ -97,8 +95,6 @@ class FakeMessageFactory {
             imageName = "pic-test-1"
         case 1:
             imageName = "pic-test-2"
-        case 2:
-            fallthrough
         default:
             imageName = "pic-test-3"
         }
@@ -146,7 +142,13 @@ class TutorialMessageFactory {
                 result.append(createTextMessageModel("tutorial-\(index)", text: content, isIncoming: isIncoming))
             } else {
                 let image = UIImage(named: content)!
-                result.append(createPhotoMessageModel("tutorial-\(index)", image:image, size: image.size, isIncoming: isIncoming))
+                let photoMessage = createPhotoMessageModel(
+                    "tutorial-\(index)",
+                    image: image,
+                    size: image.size,
+                    isIncoming: isIncoming
+                )
+                result.append(photoMessage)
             }
         }
         return result

ChattoApp/ChattoApp/Source/Sending status/SendingStatusPresenter.swift

@@ -85,7 +85,7 @@ class SendingStatusPresenter: ChatItemPresenterProtocol {
         }
 
         let attrs = [
-            NSFontAttributeName : UIFont.systemFont(ofSize: 10.0),
+            NSFontAttributeName: UIFont.systemFont(ofSize: 10.0),
             NSForegroundColorAttributeName: self.statusModel.status == .failed ? UIColor.red : UIColor.black
         ]
         statusCell.text = NSAttributedString(