Run with consecutiveBlankLines

danielsaidi · Feb 6, 2024 · 061f6fc · 061f6fc
1 parent 561e7ba
commit 061f6fc
Show file tree

Hide file tree

Showing 25 changed files with 1 addition and 69 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -2,5 +2,6 @@
 --swiftversion 5.8
 
 # rules
+--rules consecutiveBlankLines
 --rules consecutiveSpaces
 --rules trailingSpace
diff --git a/Sources/RichTextKit/Actions/RichTextAction.swift b/Sources/RichTextKit/Actions/RichTextAction.swift
@@ -149,7 +149,6 @@ public extension RichTextAction {
     }
 }
 
-
 // MARK: - Aliases
 
 public extension RichTextAction {

diff --git a/Sources/RichTextKit/Colors/ColorRepresentable.swift b/Sources/RichTextKit/Colors/ColorRepresentable.swift
@@ -16,7 +16,6 @@ import AppKit
 public typealias ColorRepresentable = NSColor
 #endif
 
-
 #if iOS || os(tvOS) || os(watchOS) || os(visionOS)
 import UIKit
 

diff --git a/Sources/RichTextKit/Component/RichTextViewComponent.swift b/Sources/RichTextKit/Component/RichTextViewComponent.swift
@@ -53,7 +53,6 @@ public protocol RichTextViewComponent: AnyObject,
     /// The text view current typing attributes.
     var typingAttributes: RichTextAttributes { get set }
 
-
     // MARK: - Setup
 
     /// Setup the view with a text and data format.
@@ -62,7 +61,6 @@ public protocol RichTextViewComponent: AnyObject,
         format: RichTextDataFormat
     )
 
-
     // MARK: - Functions
 
     /// Show an alert with a title, message and button text.
@@ -87,7 +85,6 @@ public protocol RichTextViewComponent: AnyObject,
     func undoLatestChange()
 }
 
-
 // MARK: - Public Extension
 
 public extension RichTextViewComponent {

diff --git a/Sources/RichTextKit/Context/RichTextContext.swift b/Sources/RichTextKit/Context/RichTextContext.swift
@@ -45,7 +45,6 @@ public class RichTextContext: ObservableObject {
     /// The currently selected range, if any.
     public internal(set) var selectedRange = NSRange()
 
-
     // MARK: - Public properies
 
     /// Whether or not the text is currently being edited.

diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator.swift
@@ -48,7 +48,6 @@ open class RichTextCoordinator: NSObject {
         subscribeToUserActions()
     }
 
-
     // MARK: - Properties
 
     /// The rich text context to coordinate with.
@@ -66,7 +65,6 @@ open class RichTextCoordinator: NSObject {
     /// This flag is used to avoid delaying context sync.
     var shouldDelaySyncContextWithTextView = true
 
-
     // MARK: - Internal Properties
 
     /**
@@ -81,7 +79,6 @@ open class RichTextCoordinator: NSObject {
      */
      var highlightedRangeOriginalForegroundColor: ColorRepresentable?
 
-
     #if canImport(UIKit)
 
     // MARK: - UITextViewDelegate
@@ -103,7 +100,6 @@ open class RichTextCoordinator: NSObject {
     }
     #endif
 
-
     #if canImport(AppKit) && !targetEnvironment(macCatalyst)
 
     // MARK: - NSTextViewDelegate
@@ -126,7 +122,6 @@ open class RichTextCoordinator: NSObject {
     #endif
 }
 
-
 #if iOS || os(tvOS) || os(visionOS)
 import UIKit
 
@@ -138,7 +133,6 @@ import AppKit
 extension RichTextCoordinator: NSTextViewDelegate {}
 #endif
 
-
 // MARK: - Public Extensions
 
 public extension RichTextCoordinator {
@@ -155,7 +149,6 @@ public extension RichTextCoordinator {
     }
 }
 
-
 // MARK: - Internal Extensions
 
 extension RichTextCoordinator {

diff --git a/Sources/RichTextKit/Fonts/RichTextFont+PickerFont.swift b/Sources/RichTextKit/Fonts/RichTextFont+PickerFont.swift
@@ -59,7 +59,6 @@ public extension RichTextFont {
     }
 }
 
-
 // MARK: - Static Properties
 
 public extension RichTextFont.PickerFont {
@@ -92,7 +91,6 @@ public extension RichTextFont.PickerFont {
     }
 }
 
-
 // MARK: - Public Properties
 
 public extension RichTextFont.PickerFont {
@@ -113,7 +111,6 @@ public extension RichTextFont.PickerFont {
     }
 }
 
-
 // MARK: - Collection Extensions
 
 public extension Collection where Element == RichTextFont.PickerFont {
@@ -135,7 +132,6 @@ public extension Collection where Element == RichTextFont.PickerFont {
     }
 }
 
-
 // MARK: - System Fonts
 
 private extension RichTextFont.PickerFont {

diff --git a/Sources/RichTextKit/Format/RichTextFormatSidebar.swift b/Sources/RichTextKit/Format/RichTextFormatSidebar.swift
@@ -83,7 +83,6 @@ public struct RichTextFormatSidebar: View {
     }
 }
 
-
 private struct SidebarSection<Content: View>: View {
 
     let title: String?

diff --git a/Sources/RichTextKit/Images/RichTextImageAttachment.swift b/Sources/RichTextKit/Images/RichTextImageAttachment.swift
@@ -147,15 +147,13 @@ open class RichTextImageAttachment: NSTextAttachment {
         super.init(coder: coder)
     }
 
-
     /**
      Whether or not the attachment supports secure coding.
 
      This attachment type supports secure coding by default.
      */
     public override class var supportsSecureCoding: Bool { true }
 
-
     #if iOS || os(tvOS) || os(visionOS)
     /**
      Get or set the attachment image.

diff --git a/Sources/RichTextKit/RichTextEditor.swift b/Sources/RichTextKit/RichTextEditor.swift
@@ -89,7 +89,6 @@ public struct RichTextEditor: ViewRepresentable {
     }
     #endif
 
-
     public func makeCoordinator() -> RichTextCoordinator {
         RichTextCoordinator(
             text: text,
@@ -98,7 +97,6 @@ public struct RichTextEditor: ViewRepresentable {
         )
     }
 
-
     #if iOS || os(tvOS) || os(visionOS)
     public func makeUIView(context: Context) -> some UIView {
         textView.setup(with: text.wrappedValue, format: format)
@@ -122,7 +120,6 @@ public struct RichTextEditor: ViewRepresentable {
     #endif
 }
 
-
 // MARK: RichTextPresenter
 
 public extension RichTextEditor {
@@ -133,7 +130,6 @@ public extension RichTextEditor {
     }
 }
 
-
 // MARK: RichTextReader
 
 public extension RichTextEditor {
@@ -144,7 +140,6 @@ public extension RichTextEditor {
     }
 }
 
-
 // MARK: RichTextWriter
 
 public extension RichTextEditor {

diff --git a/Sources/RichTextKit/RichTextView_AppKit.swift b/Sources/RichTextKit/RichTextView_AppKit.swift
@@ -36,7 +36,6 @@ open class RichTextView: NSTextView, RichTextViewComponent {
     /// The image configuration to use by the rich text view.
     public var imageConfiguration: RichTextImageConfiguration = .disabled
 
-
     // MARK: - Overrides
 
     /// Paste the current pasteboard content into the view.
@@ -93,7 +92,6 @@ open class RichTextView: NSTextView, RichTextViewComponent {
             .scrollWheel(with: event)
     }
 
-
     // MARK: - Setup
 
     /**
@@ -122,7 +120,6 @@ open class RichTextView: NSTextView, RichTextViewComponent {
         setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
     }
 
-
     // MARK: - Open Functionality
 
     /**
@@ -172,7 +169,6 @@ open class RichTextView: NSTextView, RichTextViewComponent {
     }
 }
 
-
 // MARK: - Public Extensions
 
 public extension RichTextView {
@@ -189,7 +185,6 @@ public extension RichTextView {
     }
 }
 
-
 // MARK: - RichTextProvider
 
 public extension RichTextView {
@@ -206,7 +201,6 @@ public extension RichTextView {
     }
 }
 
-
 // MARK: - RichTextWriter
 
 public extension RichTextView {

diff --git a/Sources/RichTextKit/RichTextView_UIKit.swift b/Sources/RichTextKit/RichTextView_UIKit.swift
@@ -26,7 +26,6 @@ extension RichTextView: UIDropInteractionDelegate {}
  */
 open class RichTextView: UITextView, RichTextViewComponent {
 
-
     // MARK: - Initializers
 
     public convenience init(
@@ -45,7 +44,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
         self.setup(with: string, format: format)
     }
 
-
     // MARK: - Properties
 
     /// The configuration to use by the rich text view.
@@ -74,7 +72,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
         }
     }
 
-
     #if iOS || os(visionOS)
 
     /// The image drop interaction to use.
@@ -89,14 +86,12 @@ open class RichTextView: UITextView, RichTextViewComponent {
 
     #endif
 
-
     /// Keeps track of the first time a valid frame is set.
     private var isInitialFrameSetupNeeded = true
 
     /// Keeps track of the data format used by the view.
     private var richTextDataFormat: RichTextDataFormat = .archivedData
 
-
     // MARK: - Overrides
 
     /**
@@ -144,7 +139,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
     }
     #endif
 
-
     // MARK: - Setup
 
     /**
@@ -175,7 +169,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
         setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
     }
 
-
     // MARK: - Open Functionality
 
     /// Alert a certain title and message.
@@ -245,7 +238,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
         undoManager?.undo()
     }
 
-
     #if iOS || os(visionOS)
 
     // MARK: - UIDropInteractionDelegate
@@ -296,7 +288,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
         performTextDrop(with: session, at: range)
     }
 
-
     // MARK: - Drop Interaction Support
 
     /**
@@ -357,7 +348,6 @@ private extension UIDropSession {
 }
 #endif
 
-
 // MARK: - Public Extensions
 
 public extension RichTextView {
@@ -385,7 +375,6 @@ public extension RichTextView {
     }
 }
 
-
 // MARK: - RichTextProvider
 
 public extension RichTextView {
@@ -397,7 +386,6 @@ public extension RichTextView {
     }
 }
 
-
 // MARK: - RichTextWriter
 
 public extension RichTextView {

diff --git a/Sources/RichTextKit/_Deprecated/RichTextViewComponent+Deprecated.swift b/Sources/RichTextKit/_Deprecated/RichTextViewComponent+Deprecated.swift
@@ -12,7 +12,6 @@ public extension RichTextViewComponent {
         richTextFont?.pointSize
     }
 
-
     @available(*, deprecated, renamed: "currentColor(_:)")
     var currentBackgroundColor: ColorRepresentable? {
         currentColor(.background)
@@ -145,7 +144,6 @@ public extension RichTextViewComponent {
         setRichTextAlignment(alignment)
     }
 
-
     @available(*, deprecated, message: "richTextColor(_:)")
     func currentColor(_ color: RichTextColor) -> ColorRepresentable? {
         richTextColor(color)
@@ -158,7 +156,6 @@ public extension RichTextViewComponent {
         setRichTextAttribute(attribute, to: val)
     }
 
-
     @available(*, deprecated, message: "richTextFont")
     var currentFont: FontRepresentable? {
         richTextFont
@@ -194,7 +191,6 @@ public extension RichTextViewComponent {
         stepRichTextFontSize(points: points)
     }
 
-
     @available(*, deprecated, message: "richTextIndent")
     var currentIndent: CGFloat? {
         richTextIndent
@@ -207,7 +203,6 @@ public extension RichTextViewComponent {
         stepRichTextIndent(points: points)
     }
 
-
     @available(*, deprecated, message: "richTextStyles")
     var currentRichTextStyles: [RichTextStyle] {
         richTextStyles

diff --git a/Tests/RichTextKitTests/Extensions/String+ParagraphTests.swift b/Tests/RichTextKitTests/Extensions/String+ParagraphTests.swift
@@ -38,7 +38,6 @@ final class String_ParagraphTests: XCTestCase {
         XCTAssertEqual(currentResult(for: multi, from: 10), 8)
     }
 
-
     func testIndexOfNextParagraphIsCorrectForEmptyString() {
         XCTAssertEqual(nextResult(for: "", from: 0), 0)
         XCTAssertEqual(nextResult(for: "", from: 20), 0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,7 +149,6 @@ public extension RichTextAction { @@
         }
     }
     // MARK: - Aliases
     public extension RichTextAction {
@@ Expand Down @@