镜像站点 · 本页由第三方 GitHub 只读镜像提供，非 GitHub 官方站点，不接受任何登录或凭据输入。前往 github.com
Skip to content

Fix programmatic cursor position updates #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gerardp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix programmatic cursor position updates #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/CodeEditSourceEditor/SourceEditor/SourceEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ public struct SourceEditor: NSViewControllerRepresentable {
return
}

private func updateControllerWithState(_ state: SourceEditorState, controller: TextViewController) {
if let cursorPositions = state.cursorPositions, cursorPositions != state.cursorPositions {
func updateControllerWithState(_ state: SourceEditorState, controller: TextViewController) {
if let cursorPositions = state.cursorPositions, cursorPositions != controller.cursorPositions {
controller.setCursorPositions(cursorPositions)
}

Expand Down
18 changes: 18 additions & 0 deletions Tests/CodeEditSourceEditorTests/Controller/TextViewControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,24 @@ final class TextViewControllerTests: XCTestCase {
XCTAssertEqual(controller.cursorPositions[1].start.column, 1)
}

func test_sourceEditorUpdatesCursorPositionsFromState() {
controller.setText("1\n2\n")
controller.setCursorPositions([CursorPosition(line: 1, column: 1)])
let editor = SourceEditor(
.constant(""),
language: .default,
configuration: Mock.config(),
state: .constant(SourceEditorState())
)

editor.updateControllerWithState(
SourceEditorState(cursorPositions: [CursorPosition(line: 2, column: 1)]),
controller: controller
)

XCTAssertEqual(controller.cursorPositions.first?.start, CursorPosition.Position(line: 2, column: 1))
}

// MARK: - TreeSitterClient

func test_treeSitterSetUp() {
Expand Down