Add SwiftFormat config + format code with both formatters

Author: Jeehut

.swiftformat

@@ -0,0 +1,14 @@
+# Minimal SwiftFormat config for explicit self insertion only
+# Used in conjunction with Apple swift-format for comprehensive formatting
+# 
+# IMPORTANT: Only handles explicit self insertion - all other formatting 
+# is managed by Apple swift-format to avoid conflicts
+
+# Swift version
+--swift-version 6.1
+
+# Explicit self rule only
+--self insert
+
+# Use only the redundantSelf rule (exclusive list)
+--rules redundantSelf

Sources/HandySwift/Extensions/ComparableExt.swift

@@ -77,7 +77,7 @@ extension Comparable {
    /// - Parameter limits: The closed range determining minimum and maximum value.
    @inlinable
    public mutating func clamp(to limits: ClosedRange<Self>) {
-      self = clamped(to: limits)
+      self = self.clamped(to: limits)
    }
 
    /// Clamps `self` to the given partial range (from) limits.
@@ -93,7 +93,7 @@ extension Comparable {
    /// - Parameter limits: The partial range (from) determining the minimum value.
    @inlinable
    public mutating func clamp(to limits: PartialRangeFrom<Self>) {
-      self = clamped(to: limits)
+      self = self.clamped(to: limits)
    }
 
    /// Clamps `self` to the given partial range (through) limits.
@@ -112,6 +112,6 @@ extension Comparable {
    /// - Parameter limits: The partial range (through) determining the maximum value.
    @inlinable
    public mutating func clamp(to limits: PartialRangeThrough<Self>) {
-      self = clamped(to: limits)
+      self = self.clamped(to: limits)
    }
 }

Sources/HandySwift/Extensions/StringExt.swift

@@ -42,7 +42,7 @@ extension String {
    ///
    /// - Returns: The NSRange representation of the full string range.
    public var fullNSRange: NSRange {
-      NSRange(fullRange, in: self)
+      NSRange(self.fullRange, in: self)
    }
 
    /// Creates a new instance with a random numeric/alphabetic/alphanumeric string of given length.

Sources/HandySwift/Extensions/TimeIntervalExt.swift

@@ -87,7 +87,7 @@ extension TimeInterval {
    /// - Returns: The time interval in days.
    @inlinable
    public static func days(_ value: Double) -> TimeInterval {
-      value * secondsPerDay
+      value * self.secondsPerDay
    }
 
    /// Converts the provided value to `TimeInterval` representing hours.
@@ -96,7 +96,7 @@ extension TimeInterval {
    /// - Returns: The time interval in hours.
    @inlinable
    public static func hours(_ value: Double) -> TimeInterval {
-      value * secondsPerHour
+      value * self.secondsPerHour
    }
 
    /// Converts the provided value to `TimeInterval` representing minutes.
@@ -105,7 +105,7 @@ extension TimeInterval {
    /// - Returns: The time interval in minutes.
    @inlinable
    public static func minutes(_ value: Double) -> TimeInterval {
-      value * secondsPerMinute
+      value * self.secondsPerMinute
    }
 
    /// Converts the provided value to `TimeInterval` representing seconds.
@@ -123,7 +123,7 @@ extension TimeInterval {
    /// - Returns: The time interval in milliseconds.
    @inlinable
    public static func milliseconds(_ value: Double) -> TimeInterval {
-      value / millisecondsPerSecond
+      value / self.millisecondsPerSecond
    }
 
    /// Converts the provided value to `TimeInterval` representing microseconds.
@@ -132,7 +132,7 @@ extension TimeInterval {
    /// - Returns: The time interval in microseconds.
    @inlinable
    public static func microseconds(_ value: Double) -> TimeInterval {
-      value / microsecondsPerSecond
+      value / self.microsecondsPerSecond
    }
 
    /// Converts the provided value to `TimeInterval` representing nanoseconds.
@@ -141,7 +141,7 @@ extension TimeInterval {
    /// - Returns: The time interval in nanoseconds.
    @inlinable
    public static func nanoseconds(_ value: Double) -> TimeInterval {
-      value / nanosecondsPerSecond
+      value / self.nanosecondsPerSecond
    }
 
    /// Returns the `Duration` representation of the current time interval.

Sources/HandySwift/Types/FrequencyTable.swift

@@ -49,8 +49,8 @@ public struct FrequencyTable<T> {
    /// ```
    @inlinable
    public init(values: [T], frequencyClosure: (T) throws -> Int) rethrows {
-      valuesWithFrequencies = try values.map { ($0, try frequencyClosure($0)) }
-      frequentValues = valuesWithFrequencies.reduce(into: []) { memo, entry in
+      self.valuesWithFrequencies = try values.map { ($0, try frequencyClosure($0)) }
+      self.frequentValues = self.valuesWithFrequencies.reduce(into: []) { memo, entry in
          memo += Array(repeating: entry.value, count: entry.frequency)
       }
    }

Sources/HandySwift/Types/HandyRegex.swift

@@ -102,7 +102,7 @@ public struct HandyRegex {
    /// - throws: A value of `ErrorType` describing the invalid regular expression.
    @available(*, deprecated, message: "The HandyRegex type will be removed in a future version. Migrate to Swift.Regex<Output> if possible.")
    public init(_ pattern: String, options: Options = []) throws {
-      regularExpression = try NSRegularExpression(
+      self.regularExpression = try NSRegularExpression(
          pattern: pattern,
          options: options.toNSRegularExpressionOptions
       )
@@ -116,7 +116,7 @@ public struct HandyRegex {
    @available(*, deprecated, message: "The HandyRegex type will be removed in a future version. Migrate to Swift.Regex<Output> if possible.")
    @inlinable
    public func matches(_ string: String) -> Bool {
-      firstMatch(in: string) != nil
+      self.firstMatch(in: string) != nil
    }
 
    /// If the regex matches `string`, returns a `Match` describing the
@@ -129,7 +129,7 @@ public struct HandyRegex {
    @available(*, deprecated, message: "The HandyRegex type will be removed in a future version. Migrate to Swift.Regex<Output> if possible.")
    @inlinable
    public func firstMatch(in string: String) -> Match? {
-      regularExpression
+      self.regularExpression
          .firstMatch(in: string, options: [], range: NSRange(location: 0, length: string.utf16.count))
          .map { Match(result: $0, in: string) }
    }
@@ -144,7 +144,7 @@ public struct HandyRegex {
    @available(*, deprecated, message: "The HandyRegex type will be removed in a future version. Migrate to Swift.Regex<Output> if possible.")
    @inlinable
    public func matches(in string: String) -> [Match] {
-      regularExpression
+      self.regularExpression
          .matches(in: string, options: [], range: NSRange(location: 0, length: string.utf16.count))
          .map { Match(result: $0, in: string) }
    }
@@ -183,7 +183,7 @@ public struct HandyRegex {
 extension HandyRegex: CustomStringConvertible {
    /// Returns a string describing the regex using its pattern string.
    public var description: String {
-      "Regex<\"\(regularExpression.pattern)\">"
+      "Regex<\"\(self.regularExpression.pattern)\">"
    }
 }
 
@@ -199,7 +199,7 @@ extension HandyRegex: Equatable {
 extension HandyRegex: Hashable {
    /// Manages hashing of the `Regex` instance.
    public func hash(into hasher: inout Hasher) {
-      hasher.combine(regularExpression)
+      hasher.combine(self.regularExpression)
    }
 }
 
@@ -275,7 +275,7 @@ extension HandyRegex {
       ///     regex.matches(in: "b").first?.captures // [nil, Optional("b")]
       public lazy var captures: [String?] = {
          let captureRanges = stride(from: 0, to: result.numberOfRanges, by: 1)
-            .map(result.range)
+            .map(self.result.range)
             .dropFirst()
             .map { [unowned self] in
                Range($0, in: self.baseString)
@@ -316,17 +316,17 @@ extension HandyRegex {
       ///
       /// - returns: A string with `template` applied to the matched string.
       public func string(applyingTemplate template: String) -> String {
-         result.regularExpression!.replacementString(
-            for: result,
-            in: baseString,
+         self.result.regularExpression!.replacementString(
+            for: self.result,
+            in: self.baseString,
             offset: 0,
             template: template
          )
       }
 
       /// Returns a string describing the match.
       public var description: String {
-         "Match<\"\(string)\">"
+         "Match<\"\(self.string)\">"
       }
    }
 }

Sources/HandySwift/Types/SortedArray.swift

@@ -39,7 +39,7 @@ public struct SortedArray<Element: Comparable> {
    ///
    ///     var emptyArray = SortedArray<Int>()
    public init() {
-      internalArray = []
+      self.internalArray = []
    }
 
    /// Creates a new SortedArray with a given sequence of elements and sorts its elements.
@@ -54,7 +54,7 @@ public struct SortedArray<Element: Comparable> {
 
    @usableFromInline
    internal init<S: Sequence>(sequence: S, preSorted: Bool) where S.Iterator.Element == Element {
-      internalArray = preSorted ? Array(sequence) : Array(sequence).sorted()
+      self.internalArray = preSorted ? Array(sequence) : Array(sequence).sorted()
    }
 
    /// Returns the first index in which an element of the array satisfies the given predicate.
@@ -68,19 +68,19 @@ public struct SortedArray<Element: Comparable> {
    @inlinable
    public func firstIndex(where predicate: (Element) -> Bool) -> Int? {
       // cover trivial cases
-      guard !array.isEmpty else { return nil }
+      guard !self.array.isEmpty else { return nil }
 
-      if let first = array.first, predicate(first) { return array.startIndex }
+      if let first = array.first, predicate(first) { return self.array.startIndex }
       if let last = array.last, !predicate(last) { return nil }
 
       // binary search for first matching element
       var foundMatch = false
-      var lowerIndex = array.startIndex
-      var upperIndex = array.endIndex
+      var lowerIndex = self.array.startIndex
+      var upperIndex = self.array.endIndex
 
       while lowerIndex != upperIndex {
          let middleIndex = lowerIndex + (upperIndex - lowerIndex) / 2
-         guard predicate(array[middleIndex]) else {
+         guard predicate(self.array[middleIndex]) else {
             lowerIndex = middleIndex + 1
             continue
          }
@@ -140,8 +140,8 @@ public struct SortedArray<Element: Comparable> {
    ///   - newElement: The new element to be inserted into the array.
    @inlinable
    public mutating func insert(_ newElement: Element) {
-      let insertIndex = internalArray.firstIndex { $0 >= newElement } ?? internalArray.endIndex
-      internalArray.insert(newElement, at: insertIndex)
+      let insertIndex = self.internalArray.firstIndex { $0 >= newElement } ?? self.internalArray.endIndex
+      self.internalArray.insert(newElement, at: insertIndex)
    }
 
    /// Adds the contents of a sequence to the SortedArray.
@@ -152,7 +152,7 @@ public struct SortedArray<Element: Comparable> {
    ///   - sequence
    @inlinable
    public mutating func insert<S: Sequence>(contentsOf sequence: S) where S.Iterator.Element == Element {
-      sequence.forEach { insert($0) }
+      sequence.forEach { self.insert($0) }
    }
 
    /// Removes an item from the sorted array.
@@ -163,15 +163,15 @@ public struct SortedArray<Element: Comparable> {
    ///   - index: The index of the element to remove from the sorted array.
    @inlinable
    public mutating func remove(at index: Int) {
-      internalArray.remove(at: index)
+      self.internalArray.remove(at: index)
    }
 
    /// Removes an item from the sorted array.
    ///
    /// - Complexity: O(*n*), where *n* is the length of the collection.
    @inlinable
    public mutating func removeAll(where condition: (Element) -> Bool) {
-      internalArray.removeAll(where: condition)
+      self.internalArray.removeAll(where: condition)
    }
 
    /// Accesses a contiguous subrange of the SortedArray's elements.
@@ -180,7 +180,7 @@ public struct SortedArray<Element: Comparable> {
    ///   - bounds: A range of the SortedArray's indices. The bounds of the range must be valid indices.
    @inlinable
    public subscript(bounds: Range<Int>) -> SortedArray {
-      SortedArray(sequence: array[bounds], preSorted: true)
+      SortedArray(sequence: self.array[bounds], preSorted: true)
    }
 }
 
@@ -194,46 +194,46 @@ extension SortedArray: BidirectionalCollection {
    ///
    /// If the collection is empty, `startIndex` is equal to `endIndex`.
    @inlinable public var startIndex: Int {
-      internalArray.startIndex
+      self.internalArray.startIndex
    }
 
    /// The collection's "past-the-end" position---that is, the position one greater than the last valid subscript argument.
    ///
    /// When you need a range that includes the last element of a collection, use the `..<` operator with `endIndex`.
    public var endIndex: Int {
-      internalArray.endIndex
+      self.internalArray.endIndex
    }
 
    /// Returns the elements of the collection in sorted order.
    ///
    /// - Returns: An array containing the sorted elements of the collection.
    @inlinable
    public func sorted() -> [Element] {
-      internalArray
+      self.internalArray
    }
 
    /// Returns the position immediately after the given index.
    ///
    /// - Parameter index: A valid index of the collection. `index` must be less than `endIndex`.
    /// - Returns: The index value immediately after `index`.
    public func index(after index: Int) -> Int {
-      internalArray.index(after: index)
+      self.internalArray.index(after: index)
    }
 
    /// Returns the position immediately before the given index.
    ///
    /// - Parameter index: A valid index of the collection. `index` must be greater than `startIndex`.
    /// - Returns: The index value immediately before `index`.
    public func index(before index: Int) -> Int {
-      internalArray.index(before: index)
+      self.internalArray.index(before: index)
    }
 
    /// Accesses the element at the specified position.
    ///
    /// - Parameter position: The position of the element to access. `position` must be a valid index of the collection.
    /// - Returns: The element at the specified index.
    public subscript(position: Int) -> Element {
-      internalArray[position]
+      self.internalArray[position]
    }
 }