Skip to content

Commit ae6957f

Browse files
committed
Cleanup.
1 parent c48c0b0 commit ae6957f

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

Sources/DiffableTextKitXPattern/Placeholders.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ public struct PatternTextPlaceholders: Equatable {
2929
self.option = .none
3030
}
3131

32-
@inlinable public init(_ placeholers: (Character, (Character) -> Bool)) {
33-
self.option = .some(Some(placeholers))
32+
@inlinable public init(_ character: Character, where predicate: @escaping (Character) -> Bool) {
33+
self.option = .some(Some((character, predicate)))
3434
}
3535

36-
@inlinable public init(_ placeholers: [Character: (Character) -> Bool]) {
37-
self.option = .many(Many(placeholers))
36+
@inlinable public init(_ some: (Character, (Character) -> Bool)) {
37+
self.option = .some(Some(some))
38+
}
39+
40+
@inlinable public init(_ many: [Character: (Character) -> Bool]) {
41+
self.option = .many(Many(many))
3842
}
3943

4044
//=------------------------------------------------------------------------=

Sources/DiffableTextKitXPattern/Style.swift

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Value: RangeReplaceableCollection, Value.Element == Character {
2424

2525
public var pattern: String
2626
public var placeholders: Placeholders
27-
public var hidden: Bool
27+
public var hidden: Bool = false
2828

2929
//=------------------------------------------------------------------------=
3030
// MARK: Initializers
3131
//=------------------------------------------------------------------------=
3232

33-
@inlinable public init(_ pattern: String, placeholders: Placeholders = .init(), hidden: Bool = false) {
34-
self.pattern = pattern; self.placeholders = placeholders; self.hidden = hidden
33+
@inlinable public init(_ pattern: String, placeholders: Placeholders = .init()) {
34+
self.pattern = pattern; self.placeholders = placeholders
3535
}
3636

3737
//=------------------------------------------------------------------------=
@@ -41,17 +41,18 @@ Value: RangeReplaceableCollection, Value.Element == Character {
4141
/// Marks a single character as the style's placeholder.
4242
@inlinable public func placeholders(_ character: Character,
4343
where predicate: @escaping (Character) -> Bool) -> Self {
44-
var S0 = self; S0.placeholders = .init((character, predicate)); return S0
44+
self.placeholders((character, predicate))
4545
}
4646

47-
/// Marks multiple characters as the style's placeholders.
48-
@inlinable public func placeholders(_ placeholders: [Character: (Character) -> Bool]) -> Self {
49-
var S0 = self; S0.placeholders = .init(placeholders); return S0
47+
/// Marks a single character as the style's placeholder.
48+
@inlinable public func placeholders(_ some: (Character, (Character) -> Bool)) -> Self {
49+
var S0 = self; S0.placeholders = .init(some); return S0
5050
}
5151

52-
//=------------------------------------------------------------------------=
53-
// MARK: Transformations
54-
//=------------------------------------------------------------------------=
52+
/// Marks multiple characters as the style's placeholders.
53+
@inlinable public func placeholders(_ many: [Character: (Character) -> Bool]) -> Self {
54+
var S0 = self; S0.placeholders = .init(many); return S0
55+
}
5556

5657
/// Hides the pattern's suffix.
5758
///

Tests/DiffableTextKitXNumberTests/Styles/Style+Currency.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ extension StyleTestsOnCurrency {
7272
//=------------------------------------------------------------------------=
7373

7474
func testDecimal() {
75-
XCTAssertCurrencies(Decimal(string: "-1234567.89")!)
75+
XCTAssertCurrencies(Decimal(string: "-34567890.12")!)
7676
}
7777
}
7878

Tests/DiffableTextKitXNumberTests/Styles/Style+Number.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extension StyleTestsOnNumber {
4141
//=------------------------------------------------------------------------=
4242

4343
func testDecimal() {
44-
XCTAssertLocales(Decimal(string: "-1234567.89")!)
44+
XCTAssertLocales(Decimal(string: "-34567890.12")!)
4545
}
4646
}
4747

Tests/DiffableTextKitXNumberTests/Styles/Style+Percent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extension StyleTestsOnPercent {
4141
//=------------------------------------------------------------------------=
4242

4343
func testDecimal() {
44-
XCTAssertLocales(Decimal(string: "-1234567.89")!)
44+
XCTAssertLocales(Decimal(string: "-34567890.12")!)
4545
}
4646
}
4747

0 commit comments

Comments
 (0)