Skip to content

Commit 0b66db0

Browse files
Clean up code
1 parent d9b3886 commit 0b66db0

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

Sources/LightTableDelta/Delta.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,13 @@ extension Delta where Element: ~Copyable {
124124
case .transition(let source, let target):
125125
let source = try transform(source)
126126
let target = try transform(target)
127-
return if source != nil && target != nil {
128-
.transition(source: source!, target: target!)
129-
}
130-
else if let source {
131-
.source(source)
127+
return if let source {
128+
if let target {
129+
.transition(source: source, target: target)
130+
}
131+
else {
132+
.source(source)
133+
}
132134
}
133135
else if let target {
134136
.target(target)

Tests/LightTableDeltaTests/LightTableDeltaTests.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ import LightTableDelta
107107
(d1.endIndex ..< d1.endIndex, []),
108108
(d1.startIndex ..< d1.endIndex, [3]),
109109
]
110-
for test in t1 {
111-
#expect(d1[test.0].elementsEqual(test.1))
112-
#expect(d1[test.0][test.0].elementsEqual(test.1))
113-
#expect(d1[test.0][test.0][test.0].elementsEqual(test.1))
110+
for (range, elements) in t1 {
111+
#expect(d1[range].elementsEqual(elements))
112+
#expect(d1[range][range].elementsEqual(elements))
113+
#expect(d1[range][range][range].elementsEqual(elements))
114114
}
115115
#expect(d1[...].elementsEqual([3]))
116116
#expect(d1[...][...].elementsEqual([3]))
@@ -122,10 +122,10 @@ import LightTableDelta
122122
(d2.endIndex ..< d2.endIndex, []),
123123
(d2.startIndex ..< d2.endIndex, [5]),
124124
]
125-
for test in t2 {
126-
#expect(d2[test.0].elementsEqual(test.1))
127-
#expect(d2[test.0][test.0].elementsEqual(test.1))
128-
#expect(d2[test.0][test.0][test.0].elementsEqual(test.1))
125+
for (range, elements) in t2 {
126+
#expect(d2[range].elementsEqual(elements))
127+
#expect(d2[range][range].elementsEqual(elements))
128+
#expect(d2[range][range][range].elementsEqual(elements))
129129
}
130130
#expect(d2[...].elementsEqual([5]))
131131
#expect(d2[...][...].elementsEqual([5]))
@@ -139,10 +139,10 @@ import LightTableDelta
139139
(d3.index(after: d3.startIndex) ..< d3.endIndex, [5]),
140140
(d3.startIndex ..< d3.endIndex, [3, 5]),
141141
]
142-
for test in t3 {
143-
#expect(d3[test.0].elementsEqual(test.1))
144-
#expect(d3[test.0][test.0].elementsEqual(test.1))
145-
#expect(d3[test.0][test.0][test.0].elementsEqual(test.1))
142+
for (range, elements) in t3 {
143+
#expect(d3[range].elementsEqual(elements))
144+
#expect(d3[range][range].elementsEqual(elements))
145+
#expect(d3[range][range][range].elementsEqual(elements))
146146
}
147147
#expect(d3[...].elementsEqual([3, 5]))
148148
#expect(d3[...][...].elementsEqual([3, 5]))

0 commit comments

Comments
 (0)