Skip to content

Commit bd3a828

Browse files
thecoolwinterthecoolwinter
committed
fix:tests
1 parent 2026e68 commit bd3a828

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

‎Package.resolved‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sources/CodeEditSourceEditor/Utils/CursorPosition.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public struct CursorPosition: Sendable, Codable, Equatable, Hashable {
7272
/// - range: The range of the position.
7373
/// - start: The start position of the range.
7474
/// - end: The end position of the range.
75-
package init(range: NSRange, start: Position, end: Position?) {
75+
init(range: NSRange, start: Position, end: Position?) {
7676
self.range = range
7777
self.start = start
7878
self.end = end

‎Tests/CodeEditSourceEditorTests/Controller/TextViewControllerTests.swift‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ final class TextViewControllerTests: XCTestCase {
339339

340340
XCTAssert(controller.text == "\nHello World with newline!")
341341
XCTAssertEqual(controller.cursorPositions.count, 1)
342-
XCTAssertEqual(controller.cursorPositions[0].line, 2)
343-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
342+
XCTAssertEqual(controller.cursorPositions[0].start.line, 2)
343+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
344344
XCTAssertEqual(controller.cursorPositions[0].range.location, 1)
345345
XCTAssertEqual(controller.cursorPositions[0].range.length, 2)
346346
XCTAssertEqual(controller.textView.selectionManager.textSelections.count, 1)
@@ -359,8 +359,8 @@ final class TextViewControllerTests: XCTestCase {
359359
XCTAssertEqual(controller.cursorPositions.count, 1)
360360
XCTAssertEqual(controller.cursorPositions[0].range.location, 0)
361361
XCTAssertEqual(controller.cursorPositions[0].range.length, 5)
362-
XCTAssertEqual(controller.cursorPositions[0].line, 1)
363-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
362+
XCTAssertEqual(controller.cursorPositions[0].start.line, 1)
363+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
364364

365365
// Test an invalid position is ignored
366366
controller.setCursorPositions([CursorPosition(range: NSRange(location: -1, length: 25))])
@@ -372,8 +372,8 @@ final class TextViewControllerTests: XCTestCase {
372372
XCTAssertEqual(controller.cursorPositions.count, 1)
373373
XCTAssertEqual(controller.cursorPositions[0].range.location, 2)
374374
XCTAssertEqual(controller.cursorPositions[0].range.length, 0)
375-
XCTAssertEqual(controller.cursorPositions[0].line, 2)
376-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
375+
XCTAssertEqual(controller.cursorPositions[0].start.line, 2)
376+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
377377

378378
// Test order and validity of multiple positions.
379379
controller.setCursorPositions([
@@ -383,12 +383,12 @@ final class TextViewControllerTests: XCTestCase {
383383
XCTAssertEqual(controller.cursorPositions.count, 2)
384384
XCTAssertEqual(controller.cursorPositions[0].range.location, 2)
385385
XCTAssertEqual(controller.cursorPositions[0].range.length, 0)
386-
XCTAssertEqual(controller.cursorPositions[0].line, 2)
387-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
386+
XCTAssertEqual(controller.cursorPositions[0].start.line, 2)
387+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
388388
XCTAssertEqual(controller.cursorPositions[1].range.location, 5)
389389
XCTAssertEqual(controller.cursorPositions[1].range.length, 1)
390-
XCTAssertEqual(controller.cursorPositions[1].line, 3)
391-
XCTAssertEqual(controller.cursorPositions[1].column, 2)
390+
XCTAssertEqual(controller.cursorPositions[1].start.line, 3)
391+
XCTAssertEqual(controller.cursorPositions[1].start.column, 2)
392392
}
393393

394394
func test_cursorPositionRowColInit() {
@@ -400,8 +400,8 @@ final class TextViewControllerTests: XCTestCase {
400400
XCTAssertEqual(controller.cursorPositions.count, 1)
401401
XCTAssertEqual(controller.cursorPositions[0].range.location, 0)
402402
XCTAssertEqual(controller.cursorPositions[0].range.length, 0)
403-
XCTAssertEqual(controller.cursorPositions[0].line, 1)
404-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
403+
XCTAssertEqual(controller.cursorPositions[0].start.line, 1)
404+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
405405

406406
// Test an invalid position is ignored
407407
controller.setCursorPositions([CursorPosition(line: -1, column: 10)])
@@ -413,8 +413,8 @@ final class TextViewControllerTests: XCTestCase {
413413
XCTAssertEqual(controller.cursorPositions.count, 1)
414414
XCTAssertEqual(controller.cursorPositions[0].range.location, 2)
415415
XCTAssertEqual(controller.cursorPositions[0].range.length, 0)
416-
XCTAssertEqual(controller.cursorPositions[0].line, 2)
417-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
416+
XCTAssertEqual(controller.cursorPositions[0].start.line, 2)
417+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
418418

419419
// Test order and validity of multiple positions.
420420
controller.setCursorPositions([
@@ -424,12 +424,12 @@ final class TextViewControllerTests: XCTestCase {
424424
XCTAssertEqual(controller.cursorPositions.count, 2)
425425
XCTAssertEqual(controller.cursorPositions[0].range.location, 0)
426426
XCTAssertEqual(controller.cursorPositions[0].range.length, 0)
427-
XCTAssertEqual(controller.cursorPositions[0].line, 1)
428-
XCTAssertEqual(controller.cursorPositions[0].column, 1)
427+
XCTAssertEqual(controller.cursorPositions[0].start.line, 1)
428+
XCTAssertEqual(controller.cursorPositions[0].start.column, 1)
429429
XCTAssertEqual(controller.cursorPositions[1].range.location, 4)
430430
XCTAssertEqual(controller.cursorPositions[1].range.length, 0)
431-
XCTAssertEqual(controller.cursorPositions[1].line, 3)
432-
XCTAssertEqual(controller.cursorPositions[1].column, 1)
431+
XCTAssertEqual(controller.cursorPositions[1].start.line, 3)
432+
XCTAssertEqual(controller.cursorPositions[1].start.column, 1)
433433
}
434434

435435
// MARK: - TreeSitterClient

‎Tests/CodeEditSourceEditorTests/TagEditingTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ final class TagEditingTests: XCTestCase {
6969
)
7070
XCTAssertEqual(
7171
controller.cursorPositions[0],
72-
CursorPosition(range: NSRange(location: 43, length: 0), line: 4, column: 13)
72+
CursorPosition(range: NSRange(location: 43, length: 0), start: .init(line: 4, column: 13), end: nil)
7373
)
7474
}
7575

@@ -85,7 +85,7 @@ final class TagEditingTests: XCTestCase {
8585
)
8686
XCTAssertEqual(
8787
controller.cursorPositions[0],
88-
CursorPosition(range: NSRange(location: 7, length: 0), line: 2, column: 1)
88+
CursorPosition(range: NSRange(location: 7, length: 0), start: .init(line: 2, column: 1), end: nil)
8989
)
9090
}
9191

0 commit comments

Comments
 (0)