Merge pull request #139 from msrutek-paylocity/feature/swiftformat-co…

…nsecutiveBlankLines Use SwiftFormat with - enable `consecutiveBlankLines`
danielsaidi · Feb 6, 2024 · b8a6c15 · b8a6c15
2 parents 83c4199 + 061f6fc
commit b8a6c15
Show file tree

Hide file tree

Showing 34 changed files with 71 additions and 139 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
@@ -19,16 +19,16 @@ public enum RichTextAction: Identifiable, Equatable, RichTextLabelValue {
 
     /// Copy the currently selected text, if any.
     case copy
-    
+
     /// Dismiss any presented software keyboard.
     case dismissKeyboard
-    
+
     /// Paste a single image.
     case pasteImage(RichTextInsertion<ImageRepresentable>)
-    
+
     /// Paste multiple images.
     case pasteImages(RichTextInsertion<[ImageRepresentable]>)
-    
+
     /// Paste plain text.
     case pasteText(RichTextInsertion<String>)
 
@@ -37,25 +37,25 @@ public enum RichTextAction: Identifiable, Equatable, RichTextLabelValue {
 
     /// Redo the latest undone change.
     case redoLatestChange
-    
+
     /// Select a range.
     case selectRange(NSRange)
-    
+
     /// Set the text alignment.
     case setAlignment(_ alignment: RichTextAlignment)
-    
+
     /// Set the entire attributed string.
     case setAttributedString(NSAttributedString)
-    
+
     // Change background color
     case setColor(RichTextColor, ColorRepresentable)
-    
+
     // Highlighted renge
     case setHighlightedRange(NSRange?)
-    
+
     // Change highlighting style
     case setHighlightingStyle(RichTextHighlightingStyle)
-    
+
     /// Set a certain ``RichTextStyle``.
     case setStyle(RichTextStyle, Bool)
 
@@ -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/Colors/RichTextColor.swift b/Sources/RichTextKit/Colors/RichTextColor.swift
@@ -67,7 +67,7 @@ public extension RichTextColor {
         case .undefined: .richTextColorUndefined
         }
     }
-    
+
     /// The localized color title key.
     var titleKey: RTKL10n {
         switch self {

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+Colors.swift b/Sources/RichTextKit/Context/RichTextContext+Colors.swift
@@ -37,7 +37,7 @@ public extension RichTextContext {
     ) {
         guard self.color(for: color) != val else { return }
         userActionPublisher.send(.setColor(color, val))
-                                 
+
         switch color {
         case .foreground: foregroundColor = val
         case .background: backgroundColor = val

diff --git a/Sources/RichTextKit/Context/RichTextContext.swift b/Sources/RichTextKit/Context/RichTextContext.swift
@@ -12,7 +12,7 @@ import Combine
 /**
  This observable context can be used to affect and observe a
  ``RichTextEditor`` and its content.
- 
+
  Use ``handle(_:)`` to trigger a change, e.g. to change font,
  text style, alignment, select a range, etc. You can observe
  the various published properties to keep your UI updated as
@@ -45,33 +45,32 @@ 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.
     @Published
     public var isEditingText = false
-    
+
     /// The current text alignment, if any.
     @Published
     public var textAlignment: RichTextAlignment = .left
-    
+
     /// The current font name.
     @Published
     public var fontName = ""
-    
+
     /// The current font size.
     @Published
     public var fontSize = CGFloat.standardRichTextFontSize
-    
+
     /// The currently highlighted range, if any.
     public var highlightedRange: NSRange?
-    
+
     /// Use this Publisher to emit any attribute changes to textView.
     public let userActionPublisher: PassthroughSubject<RichTextAction, Never> = .init()
-    
+
     // MARK: - Internal properties
-    
+
     /// The current background color, if any.
     @Published
     public internal(set) var backgroundColor: ColorRepresentable?
@@ -95,7 +94,7 @@ public class RichTextContext: ObservableObject {
     /// Whether or not the indent level can be increased.
     @Published
     public internal(set) var canIncreaseIndent = true
-    
+
     /// The current foreground color, if any.
     @Published
     public internal(set) var foregroundColor: ColorRepresentable?

diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator+ColorSubscriptions.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 extension RichTextCoordinator {
-    
+
     func setColor(_ color: RichTextColor, to val: ColorRepresentable) {
         var applyRange: NSRange? = nil
         if textView.hasSelectedRange {

diff --git a/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift b/Sources/RichTextKit/Coordinator/RichTextCoordinator+Subscriptions.swift
@@ -16,7 +16,7 @@ extension RichTextCoordinator {
             self?.handle(action)
         }
         .store(in: &cancellables)
-        
+
         subscribeToAlignment()
         subscribeToFontName()
         subscribeToFontSize()
@@ -117,7 +117,7 @@ extension RichTextCoordinator {
             moveCursorToPastedContent: data.moveCursor
         )
     }
-    
+
     func pasteImages(_ data: RichTextInsertion<[ImageRepresentable]>?) {
         guard let data = data else { return }
         textView.pasteImages(
@@ -126,7 +126,7 @@ extension RichTextCoordinator {
             moveCursorToPastedContent: data.moveCursor
         )
     }
-    
+
     func pasteText(_ data: RichTextInsertion<String>?) {
         guard let data = data else { return }
         textView.pasteText(

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/Data/RichTextDataFormat.swift b/Sources/RichTextKit/Data/RichTextDataFormat.swift
@@ -20,7 +20,7 @@ import UniformTypeIdentifiers
  can be used elsewhere.
 
  ``archivedData`` uses an `rtk` file extension, as well as a
- `UTType.archivedData` uniform type. You can create a custom 
+ `UTType.archivedData` uniform type. You can create a custom
  ``vendorArchivedData(id:fileExtension:fileFormatText:uniformType:)``
  value to specify a custom data format.
 

diff --git a/Sources/RichTextKit/Fonts/RichTextFont+Picker.swift b/Sources/RichTextKit/Fonts/RichTextFont+Picker.swift
@@ -12,7 +12,7 @@ public extension RichTextFont {
 
     /**
      This font picker can be used to pick a font from a list.
-     
+
      This picker uses ``RichTextFont/PickerFont/all`` as the
      default fonts.
 

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/Image+RichText.swift b/Sources/RichTextKit/Images/Image+RichText.swift
@@ -44,7 +44,7 @@ public extension Image {
 
     static let richTextIndentDecrease = symbol("decrease.indent")
     static let richTextIndentIncrease = symbol("increase.indent")
-    
+
     static let richTextSelection = symbol("123.rectangle.fill")
 
     static let richTextStyleBold = symbol("bold")

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/Localization/RTKL10n.swift b/Sources/RichTextKit/Localization/RTKL10n.swift
@@ -25,7 +25,7 @@ public enum RTKL10n: String, CaseIterable, Identifiable {
     underlineColor,
     strikethroughColor,
     strokeColor,
-    
+
     actionCopy,
     actionDismissKeyboard,
     actionFontSizeIncrease,
@@ -55,17 +55,17 @@ public enum RTKL10n: String, CaseIterable, Identifiable {
     menuShare,
     menuShareAs,
     menuText,
-    
+
     highlightedRange,
     highlightingStyle,
-    
+
     pasteImage,
     pasteImages,
     pasteText,
     selectRange,
-    
+
     setAttributedString,
-    
+
     styleBold,
     styleItalic,
     styleStrikethrough,
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ import AppKit @@
     public typealias ColorRepresentable = NSColor
     #endif
     #if iOS || os(tvOS) || os(watchOS) || os(visionOS)
     import UIKit
@@ Expand Down @@