Skip to content

Commit 95093d4

Browse files
committed
Rename some variables in test case
Add one more test case to test the result of String.difference return sequential edits
1 parent 374160e commit 95093d4

File tree

3 files changed

+34
-12
lines changed

3 files changed

+34
-12
lines changed

Sources/_SwiftSyntaxTestSupport/SourceEditsTestUtils.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ public func getConcurrentEdits(from base: String, to new: String) -> ConcurrentE
3939
}
4040

4141
let sourceEdits = diffArray.map({
42-
return $0.isInsert ? SourceEdit(offset: $0.offset, length: 0, replacementLength: 1) : SourceEdit(offset: $0.offset, length: 1, replacementLength: 0)
42+
if $0.isInsert {
43+
return SourceEdit(offset: $0.offset, length: 0, replacementLength: 1)
44+
} else {
45+
return SourceEdit(offset: $0.offset, length: 1, replacementLength: 0)
46+
}
4347
})
4448

4549
return ConcurrentEdits(fromSequential: sourceEdits)

Tests/SwiftParserTest/IncrementalParsingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class IncrementalParsingTests: XCTestCase {
4040

4141
let newSource =
4242
"""
43-
struct A {}
43+
struct AA {}
4444
struct B {}
4545
"""
4646

Tests/SwiftSyntaxTestSupportTest/SourceEditsTestUtilsTest.swift

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,47 @@ import SwiftSyntax
1515
import _SwiftSyntaxTestSupport
1616

1717
public class SourceEditsUtilTest: XCTestCase {
18+
public func testStringDifferenceReturnSequentialEdits() {
19+
let base = "0123"
20+
let new = "a0123bc"
21+
22+
let diffs = getConcurrentEdits(from: base, to: new)
23+
XCTAssertEqual(
24+
diffs.edits,
25+
[
26+
SourceEdit(offset: 0, length: 0, replacementLength: 1),
27+
SourceEdit(offset: 4, length: 0, replacementLength: 2),
28+
]
29+
)
30+
31+
let appliedDiffsBase = applyEdits(diffs.edits, concurrent: true, to: base)
32+
33+
XCTAssertEqual(appliedDiffsBase, "?0123??")
34+
}
35+
1836
public func testDiffOfTwoStringsSimple() throws {
19-
let s1 = "struct A { func f() {"
20-
let s2 = "struct AA { func f() {"
37+
let base = "struct A { func f() {"
38+
let new = "struct AA { func f() {"
2139

22-
let diffs = getConcurrentEdits(from: s1, to: s2)
40+
let diffs = getConcurrentEdits(from: base, to: new)
2341
XCTAssertEqual(diffs.edits.count, 1)
2442

2543
let firstDiff = try XCTUnwrap(diffs.edits.first)
2644
XCTAssertEqual(firstDiff, SourceEdit(offset: 8, length: 0, replacementLength: 1))
2745
}
2846

2947
public func testDiffOfTwoSameStrings() {
30-
let s1 = "0123456"
48+
let base = "0123456"
3149

32-
let diffs = getConcurrentEdits(from: s1, to: s1)
50+
let diffs = getConcurrentEdits(from: base, to: base)
3351
XCTAssert(diffs.edits.isEmpty)
3452
}
3553

3654
public func testDiffOfTwoStrings() {
37-
let s1 = "0123456"
38-
let s2 = "x12456yz"
55+
let base = "0123456"
56+
let new = "x12456yz"
3957

40-
let diffs = getConcurrentEdits(from: s1, to: s2)
58+
let diffs = getConcurrentEdits(from: base, to: new)
4159

4260
let expectedDiffs: [SourceEdit] = [
4361
SourceEdit(offset: 0, length: 1, replacementLength: 1),
@@ -47,8 +65,8 @@ public class SourceEditsUtilTest: XCTestCase {
4765

4866
XCTAssertEqual(diffs.edits, expectedDiffs)
4967

50-
let s3 = applyEdits(expectedDiffs, concurrent: true, to: s1)
68+
let appliedDiffsBase = applyEdits(expectedDiffs, concurrent: true, to: base)
5169

52-
XCTAssertEqual(s3, "?12456??")
70+
XCTAssertEqual(appliedDiffsBase, "?12456??")
5371
}
5472
}

0 commit comments

Comments
 (0)