Fix linting

danielsaidi · danielsaidi · commit 8e3c3d30c087 · 2024-02-18T22:26:35.000+01:00
diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Indent.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Indent.swift
@@ -22,7 +22,7 @@ public extension RichTextViewComponent {
     var richTextIndent: CGFloat? {
         richTextParagraphStyle?.headIndent
     }
-    
+
     /// Set the rich text indent.
     func setRichTextIndent(to val: CGFloat) {
         let style = NSMutableParagraphStyle(
diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Line.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Line.swift
@@ -25,7 +25,7 @@ public extension RichTextViewComponent {
     ///
     /// > Todo: The function currently can't handle multiple
     /// selected paragraphs. If many paragraphs are selected,
-    /// it will only affect the first one. 
+    /// it will only affect the first one.
     func setRichTextLineSpacing(_ spacing: CGFloat) {
         if richTextLineSpacing == spacing { return }
         let style = NSMutableParagraphStyle(
diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Paragraph.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Paragraph.swift
@@ -22,7 +22,7 @@ public extension RichTextViewComponent {
     var richTextParagraphStyle: NSMutableParagraphStyle? {
         richTextAttribute(.paragraphStyle)
     }
-    
+
     /// Set the paragraph style.
     ///
     /// > Todo: The function currently can't handle multiple
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+Actions.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator+Actions.swift
@@ -92,10 +92,10 @@ extension RichTextCoordinator {
         guard let newValue else { return }
         textView.setRichText(newValue)
     }
-    
+
     // TODO: This code should be handled by the component
     func setColor(_ color: RichTextColor, to val: ColorRepresentable) {
-        var applyRange: NSRange? = nil
+        var applyRange: NSRange?
         if textView.hasSelectedRange {
             applyRange = textView.selectedRange
         }
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift
@@ -31,7 +31,7 @@ extension RichTextCoordinator {
 }
 
 private extension RichTextCoordinator {
-    
+
     func subscribe<T>(
         to publisher: Published<T>.Publisher,
         action: @escaping (T) -> Void
diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator.swift
@@ -169,7 +169,7 @@ extension RichTextCoordinator {
             syncContextWithTextViewAfterDelay()
         }
     }
-    
+
     func sync<T: Equatable>(_ prop: inout T, with value: T) {
         if prop == value { return }
         prop = value
diff --git a/Sources/RichTextKit/Keyboard/RichTextKeyboardToolbar.swift b/Sources/RichTextKit/Keyboard/RichTextKeyboardToolbar.swift
@@ -43,7 +43,7 @@ public struct RichTextKeyboardToolbar<LeadingButtons: View, TrailingButtons: Vie
      - Parameters:
        - context: The context to affect.
        - style: The toolbar style to apply, by default ``RichTextKeyboardToolbarStyle/standard``.
-       - configuration: The toolbar configuration to apply, by default ``RichTextKeyboardToolbarConfiguration/standard``.
+       - configuration: The view configuration, by default ``RichTextKeyboardToolbarConfiguration/standard``.
        - leadingActions: The leading actions, by default `.undo`, `.redo` and `.copy`.
        - trailingActions: The trailing actions, by default `.dismissKeyboard`.
        - leadingButtons: The leading buttons to place after the leading actions.
@@ -76,7 +76,7 @@ public struct RichTextKeyboardToolbar<LeadingButtons: View, TrailingButtons: Vie
      - Parameters:
        - context: The context to affect.
        - style: The toolbar style to apply, by default ``RichTextKeyboardToolbarStyle/standard``.
-       - configuration: The toolbar configuration to apply, by default ``RichTextKeyboardToolbarConfiguration/standard``.
+       - configuration: The view configuration, by default ``RichTextKeyboardToolbarConfiguration/standard``.
        - leadingActions: The leading actions, by default `.undo`, `.redo` and `.copy`.
        - trailingActions: The trailing actions, by default `.dismissKeyboard`.
        - leadingButtons: The leading buttons to place after the leading actions.
diff --git a/Sources/RichTextKit/RichTextView_UIKit.swift b/Sources/RichTextKit/RichTextView_UIKit.swift
@@ -101,7 +101,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
     /// Keeps track of the data format used by the view.
     private var richTextDataFormat: RichTextDataFormat = .archivedData
 
-    
     // MARK: - Overrides
 
     /**
@@ -149,7 +148,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
     }
     #endif
 
-    
     // MARK: - Setup
 
     /**
diff --git a/Tests/RichTextKitTests/RichTextCoordinatorIntegrationTests+UIKit.swift b/Tests/RichTextKitTests/RichTextCoordinatorIntegrationTests+UIKit.swift
@@ -68,12 +68,14 @@ final class RichTextCoordinatorIntegrationTests: XCTestCase {
 
         textView.simulateTyping(of: firstTypingPart)
 
+        let attributes = textView.richTextAttributes
+
         textContext.selectRange(NSRange(location: Self.initialAttributedString.length, length: firstTypingPart.count))
-        XCTAssertEqual(textView.richTextAttributes[.font] as? FontRepresentable, FontRepresentable.systemFont(ofSize: 16))
-        XCTAssertEqual(textView.richTextAttributes[.foregroundColor] as? ColorRepresentable, ColorRepresentable.red)
+        XCTAssertEqual(attributes[.font] as? FontRepresentable, FontRepresentable.systemFont(ofSize: 16))
+        XCTAssertEqual(attributes[.foregroundColor] as? ColorRepresentable, ColorRepresentable.red)
 
         textView.setRichTextStyle(.strikethrough, to: true)
-        XCTAssertEqual(textView.richTextAttributes[.strikethroughStyle] as? Int, 1)
+        XCTAssertEqual(attributes[.strikethroughStyle] as? Int, 1)
     }
 }
 #endif
diff --git a/Tests/RichTextKitTests/RichTextCoordinatorTests.swift b/Tests/RichTextKitTests/RichTextCoordinatorTests.swift
@@ -59,19 +59,19 @@ final class RichTextCoordinatorTests: XCTestCase {
         XCTAssertEqual(coordinator.text.wrappedValue.string, "foo bar baz")
         XCTAssertEqual(coordinator.context.selectedRange, range)
     }
-    
+
     func testChangingSomeViewPropertiesUpdatesContextAutomatically() {
         view.attributedString = .init(string: "foo bar")
         view.selectedRange = .init(location: 0, length: 0)
-        
+
         XCTAssertFalse(context.hasSelectedRange)
         XCTAssertFalse(context.canCopy)
         XCTAssertFalse(context.canRedoLatestChange)
-        
+
         view.typingAttributes[.font] = FontRepresentable.systemFont(ofSize: 10)
         view.attributedString = .init(string: "foo bar")
         view.selectedRange = .init(location: 1, length: 2)
-        
+
         XCTAssertEqual(context.attributedString, view.attributedString)
         XCTAssertEqual(context.attributedString.string, "foo bar")
         XCTAssertEqual(context.selectedRange, view.selectedRange)
@@ -85,9 +85,9 @@ final class RichTextCoordinatorTests: XCTestCase {
         // XCTAssertEqual(context.lineSpacing, view.richTextLineSpacing) TODO: Not done yet
         XCTAssertEqual(context.textAlignment, view.richTextAlignment)
     }
-    
+
     func testChangingOtherViewPropertiesUpdatesContextAfterExplicitUpdate() {
-        
+
     }
 
     func assertIsSyncedWithContext(macOSAlignment: RichTextAlignment = .left) {
diff --git a/Tests/RichTextKitTests/RichTextViewIntegrationTests+UIKit.swift b/Tests/RichTextKitTests/RichTextViewIntegrationTests+UIKit.swift
@@ -14,12 +14,17 @@ import SwiftUI
 import XCTest
 
 final class RichTextViewIntegrationTests: XCTestCase {
+
     private var text: NSAttributedString!
     private var textBinding: Binding<NSAttributedString>!
     private var textView: RichTextView!
     private var textContext: RichTextContext!
     private var coordinator: RichTextCoordinator!
 
+    private var attributes: RichTextAttributes {
+        textView.richTextAttributes
+    }
+
     override func setUp() {
         super.setUp()
 
@@ -53,16 +58,16 @@ final class RichTextViewIntegrationTests: XCTestCase {
         // When starting RichTextEditor we want to check if the font and color is set correctly.
         textContext.selectRange(.init(location: 0, length: 0))
 
-        XCTAssertEqual(textView.richTextAttributes[.font] as? FontRepresentable, FontRepresentable.systemFont(ofSize: 16))
-        XCTAssertEqual(textView.richTextAttributes[.foregroundColor] as? ColorRepresentable, ColorRepresentable.label)
+        XCTAssertEqual(attributes[.font] as? FontRepresentable, FontRepresentable.systemFont(ofSize: 16))
+        XCTAssertEqual(attributes[.foregroundColor] as? ColorRepresentable, ColorRepresentable.label)
 
         // First we fill in the empty textView with some text, select it and set bold and italic to it.
         assertFirstTextPart()
-        // After that we append more text, asserting that this text carries same attributes as the one before
-        // and we change it.
+        // After that we append more text, asserting that this text carries same attributes as the one
+        // before and we change it.
         assertSecondTextPart()
-        // Finally, we set typingAttributes before we append last text and check if those typingAttributes are set to our
-        // new text.
+        // Finally, we set typingAttributes before we append last text and check if those typingAttributes 
+        // are set to our new text.
         assertFinalTextPart()
     }
 
@@ -71,8 +76,8 @@ final class RichTextViewIntegrationTests: XCTestCase {
 
         textContext.selectRange(.init(location: 0, length: stringWithoutAttributes.count))
 
-        XCTAssertEqual(textView.richTextAttributes[.font] as? FontRepresentable, FontRepresentable.systemFont(ofSize: 16))
-        XCTAssertEqual(textView.richTextAttributes[.foregroundColor] as? ColorRepresentable, ColorRepresentable.label)
+        XCTAssertEqual(attributes[.font] as? FontRepresentable, FontRepresentable.systemFont(ofSize: 16))
+        XCTAssertEqual(attributes[.foregroundColor] as? ColorRepresentable, ColorRepresentable.label)
 
         textView.setRichTextStyle(.bold, to: true)
         textView.setRichTextStyle(.italic, to: true)
@@ -89,19 +94,24 @@ final class RichTextViewIntegrationTests: XCTestCase {
     private func assertSecondTextPart() {
         textView.simulateTyping(of: otherStringToAppend)
 
-        textContext.selectRange(NSRange(location: stringWithoutAttributes.count , length: otherStringToAppend.count))
+        textContext.selectRange(NSRange(location: stringWithoutAttributes.count, length: otherStringToAppend.count))
         let selectedRange = textView.selectedRange
         XCTAssertFalse(try XCTUnwrap(textView.richTextFont?.fontDescriptor.symbolicTraits.contains(.traitBold)))
         textView.setRichTextStyle(.strikethrough, to: true)
 
-        XCTAssertEqual(textView.richTextAttributes[.strikethroughStyle] as? Int, 1)
+        XCTAssertEqual(attributes[.strikethroughStyle] as? Int, 1)
         XCTAssertEqual(textView.richTextAttributes(at: selectedRange)[.strikethroughStyle] as? Int, 1)
         XCTAssertNil(
-            textView.richTextAttributes(at: NSRange(location: .zero, length: stringWithoutAttributes.count))[.strikethroughStyle]
+            textView.richTextAttributes(
+                at: NSRange(
+                    location: .zero,
+                    length: stringWithoutAttributes.count
+                )
+            )[.strikethroughStyle]
         )
 
-        textContext.selectRange(NSRange(location: 2 , length: .zero))
-        XCTAssertNil(textView.richTextAttributes[.strikethroughStyle])
+        textContext.selectRange(NSRange(location: 2, length: .zero))
+        XCTAssertNil(attributes[.strikethroughStyle])
     }
 
     private func assertFinalTextPart() {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public extension RichTextViewComponent {`
`22`	`22`	`var richTextIndent: CGFloat? {`
`23`	`23`	`richTextParagraphStyle?.headIndent`
`24`	`24`	`}`
`25`		`-`
	`25`	`+`
`26`	`26`	`/// Set the rich text indent.`
`27`	`27`	`func setRichTextIndent(to val: CGFloat) {`
`28`	`28`	`let style = NSMutableParagraphStyle(`
Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,10 @@ extension RichTextCoordinator {`
`92`	`92`	`guard let newValue else { return }`
`93`	`93`	`textView.setRichText(newValue)`
`94`	`94`	`}`
`95`		`-`
	`95`	`+`
`96`	`96`	`// TODO: This code should be handled by the component`
`97`	`97`	`func setColor(_ color: RichTextColor, to val: ColorRepresentable) {`
`98`		`- var applyRange: NSRange? = nil`
	`98`	`+ var applyRange: NSRange?`
`99`	`99`	`if textView.hasSelectedRange {`
`100`	`100`	`applyRange = textView.selectedRange`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ extension RichTextCoordinator {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`private extension RichTextCoordinator {`
`34`		`-`
	`34`	`+`
`35`	`35`	`func subscribe<T>(`
`36`	`36`	`to publisher: Published<T>.Publisher,`
`37`	`37`	`action: @escaping (T) -> Void`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ extension RichTextCoordinator {`
`169`	`169`	`syncContextWithTextViewAfterDelay()`
`170`	`170`	`}`
`171`	`171`	`}`
`172`		`-`
	`172`	`+`
`173`	`173`	`func sync<T: Equatable>(_ prop: inout T, with value: T) {`
`174`	`174`	`if prop == value { return }`
`175`	`175`	`prop = value`