Skip to content

Commit 2805a7b

Browse files
oscbysprooscbyspro
committed
Cleanup.
1 parent 0df67cf commit 2805a7b

File tree

4 files changed

+30
-60
lines changed

4 files changed

+30
-60
lines changed

‎Sources/DiffableTextKit/Models/Index.swift‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ public struct Index: Comparable, CustomStringConvertible {
2727
/// - character: The character encoded index.
2828
/// - attribute: The character encoded offset.
2929
///
30-
@inlinable @inline(__always)
31-
init(_ character: String.Index, as attribute: Int) {
30+
@inlinable @inline(__always) init(_ character: String.Index, as attribute: Int) {
3231
self.character = character
3332
self.attribute = attribute
3433
}
@@ -37,13 +36,11 @@ public struct Index: Comparable, CustomStringConvertible {
3736
String(describing: attribute)
3837
}
3938

40-
@inlinable @inline(__always)
41-
public static func == (lhs: Self, rhs: Self) -> Bool {
39+
@inlinable @inline(__always) public static func == (lhs: Self, rhs: Self) -> Bool {
4240
lhs.attribute == rhs.attribute
4341
}
4442

45-
@inlinable @inline(__always)
46-
public static func < (lhs: Self, rhs: Self) -> Bool {
43+
@inlinable @inline(__always) public static func < (lhs: Self, rhs: Self) -> Bool {
4744
lhs.attribute < rhs.attribute
4845
}
4946
}

‎Sources/DiffableTextKit/Models/Offset.swift‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
public struct Offset<Encoding: DiffableTextKit.Encoding>: Strideable,
1515
AdditiveArithmetic, ExpressibleByIntegerLiteral {
16-
16+
1717
//=------------------------------------------------------------------------=
1818
// MARK: State
1919
//=------------------------------------------------------------------------=
@@ -24,66 +24,55 @@ AdditiveArithmetic, ExpressibleByIntegerLiteral {
2424
// MARK: Initializers
2525
//=------------------------------------------------------------------------=
2626

27-
@inlinable @inline(__always)
28-
public init(_ distance: Int) {
27+
@inlinable @inline(__always) public init(_ distance: Int) {
2928
self.distance = distance
3029
}
3130

32-
@inlinable @inline(__always)
33-
public init(_ distance: Int, as type: Encoding.Type) {
31+
@inlinable @inline(__always) public init(_ distance: Int, as type: Encoding.Type) {
3432
self.distance = distance
3533
}
3634

37-
@inlinable @inline(__always)
38-
public init(integerLiteral distance: Int) {
35+
@inlinable @inline(__always) public init(integerLiteral distance: Int) {
3936
self.distance = distance
4037
}
4138

4239
//=------------------------------------------------------------------------=
4340
// MARK: Utilities
4441
//=------------------------------------------------------------------------=
4542

46-
@inlinable @inline(__always)
47-
public func advanced(by units: Int) -> Self {
43+
@inlinable @inline(__always) public func advanced(by units: Int) -> Self {
4844
Self(distance + units)
4945
}
5046

51-
@inlinable @inline(__always)
52-
public func distance(to other: Self) -> Int {
47+
@inlinable @inline(__always) public func distance(to other: Self) -> Int {
5348
other.distance - distance
5449
}
5550

5651
//=------------------------------------------------------------------------=
5752
// MARK: Utilities
5853
//=------------------------------------------------------------------------=
5954

60-
@inlinable @inline(__always)
61-
public static func < (lhs: Self, rhs: Self) -> Bool {
55+
@inlinable @inline(__always) public static func < (lhs: Self, rhs: Self) -> Bool {
6256
lhs.distance < rhs.distance
6357
}
6458

65-
@inlinable @inline(__always)
66-
public static prefix func - (instance: Self) -> Self {
59+
@inlinable @inline(__always) public static prefix func - (instance: Self) -> Self {
6760
Self(-instance.distance)
6861
}
6962

70-
@inlinable @inline(__always)
71-
public static func + (lhs: Self, rhs: Self) -> Self {
63+
@inlinable @inline(__always) public static func + (lhs: Self, rhs: Self) -> Self {
7264
Self(lhs.distance + rhs.distance)
7365
}
7466

75-
@inlinable @inline(__always)
76-
public static func - (lhs: Self, rhs: Self) -> Self {
67+
@inlinable @inline(__always) public static func - (lhs: Self, rhs: Self) -> Self {
7768
Self(lhs.distance - rhs.distance)
7869
}
7970

80-
@inlinable @inline(__always)
81-
public static func += (lhs: inout Self, rhs: Self) {
71+
@inlinable @inline(__always) public static func += (lhs: inout Self, rhs: Self) {
8272
lhs = lhs + rhs
8373
}
8474

85-
@inlinable @inline(__always)
86-
public static func -= (lhs: inout Self, rhs: Self) {
75+
@inlinable @inline(__always) public static func -= (lhs: inout Self, rhs: Self) {
8776
lhs = lhs - rhs
8877
}
8978
}
@@ -98,8 +87,7 @@ public extension Int {
9887
// MARK: Initializers
9988
//=------------------------------------------------------------------------=
10089

101-
@inlinable @inline(__always)
102-
init<T>(_ offset: Offset<T>) {
90+
@inlinable @inline(__always) init<T>(_ offset: Offset<T>) {
10391
self = offset.distance
10492
}
10593
}
@@ -108,7 +96,7 @@ public extension Int {
10896
// MARK: * Offsets
10997
//*============================================================================*
11098

111-
public protocol Offsets<Index>: Collection {
99+
public protocol Offsets: Collection {
112100

113101
//=------------------------------------------------------------------------=
114102
// MARK: Utilities

‎Sources/DiffableTextKit/Models/Snapshot.swift‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,11 @@ ExpressibleByArrayLiteral, ExpressibleByStringLiteral, RangeReplaceableCollectio
8383
// MARK: Accessors
8484
//=------------------------------------------------------------------------=
8585

86-
@inlinable @inline(__always)
87-
public var characters: String {
86+
@inlinable @inline(__always) public var characters: String {
8887
_characters
8988
}
9089

91-
@inlinable @inline(__always)
92-
public var attributes: [Attribute] {
90+
@inlinable @inline(__always) public var attributes: [Attribute] {
9391
_attributes
9492
}
9593

@@ -101,13 +99,11 @@ ExpressibleByArrayLiteral, ExpressibleByStringLiteral, RangeReplaceableCollectio
10199
// MARK: Transformations
102100
//=------------------------------------------------------------------------=
103101

104-
@inlinable @inline(__always)
105-
public mutating func select(_ position: Index) {
102+
@inlinable @inline(__always) public mutating func select(_ position: Index) {
106103
self.selection = Selection(position)
107104
}
108105

109-
@inlinable @inline(__always)
110-
public mutating func select(_ positions: Range<Index>) {
106+
@inlinable @inline(__always) public mutating func select(_ positions: Range<Index>) {
111107
self.selection = Selection(positions)
112108
}
113109
}

‎Sources/DiffableTextKit/Models/Symbol.swift‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ ExpressibleByExtendedGraphemeClusterLiteral {
2626
// MARK: Initializers
2727
//=------------------------------------------------------------------------=
2828

29-
@inlinable public init(_ character: Character, as attribute: Attribute = .content) {
30-
self.character = character; self.attribute = attribute
29+
@inlinable @inline(__always) public init(
30+
_ character: Character, as attribute: Attribute = .content) {
31+
self.character = character; self.attribute = attribute
3132
}
3233

3334
@inlinable public init(extendedGraphemeClusterLiteral character: Character) {
@@ -38,23 +39,19 @@ ExpressibleByExtendedGraphemeClusterLiteral {
3839
// MARK: Accessors
3940
//=------------------------------------------------------------------------=
4041

41-
@inlinable @inline(__always)
42-
public var virtual: Bool {
42+
@inlinable @inline(__always) public var virtual: Bool {
4343
self.attribute.contains(.virtual)
4444
}
4545

46-
@inlinable @inline(__always)
47-
public var nonvirtual: Bool {
46+
@inlinable @inline(__always) public var nonvirtual: Bool {
4847
self.attribute.contains(.virtual) == false
4948
}
5049

51-
@inlinable @inline(__always)
52-
public func contains(_ character: Character) -> Bool {
50+
@inlinable @inline(__always) public func contains(_ character: Character) -> Bool {
5351
self.character == character
5452
}
5553

56-
@inlinable @inline(__always)
57-
public func contains(_ attribute: Attribute) -> Bool {
54+
@inlinable @inline(__always) public func contains(_ attribute: Attribute) -> Bool {
5855
self.attribute.contains(attribute)
5956
}
6057

@@ -64,31 +61,23 @@ ExpressibleByExtendedGraphemeClusterLiteral {
6461
}
6562

6663
//*============================================================================*
67-
// MARK: * Symbol x Sequence
64+
// MARK: * Symbol x Sequence [...]
6865
//*============================================================================*
6966

7067
extension Sequence where Element == Symbol {
7168

72-
//=------------------------------------------------------------------------=
73-
// MARK: Utilities
74-
//=------------------------------------------------------------------------=
75-
7669
/// A sequence of nonvirtual characters.
7770
@inlinable public func nonvirtuals() -> String {
7871
String(lazy.nonvirtuals())
7972
}
8073
}
8174

8275
//*============================================================================*
83-
// MARK: * Symbol x Sequence x Lazy
76+
// MARK: * Symbol x Sequence x Lazy [...]
8477
//*============================================================================*
8578

8679
extension LazySequenceProtocol where Element == Symbol {
8780

88-
//=------------------------------------------------------------------------=
89-
// MARK: Utilities
90-
//=------------------------------------------------------------------------=
91-
9281
/// A lazy sequence of nonvirtual characters.
9382
@inlinable public func nonvirtuals() -> LazyMapSequence<LazyFilterSequence<Elements>, Character> {
9483
filter({!$0.attribute.contains(.virtual)}).map({$0.character})

0 commit comments

Comments
 (0)