Skip to content

Commit 368c54d

Browse files
thecoolwinterthecoolwinter
committed
lint:fix, Use Real Package Version
1 parent 25ddd97 commit 368c54d

File tree

4 files changed

+68
-49
lines changed

4 files changed

+68
-49
lines changed

‎Package.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ let package = Package(
1616
dependencies: [
1717
// A fast, efficient, text view for code.
1818
.package(
19-
// url: "https://github.com/CodeEditApp/CodeEditTextView.git",
20-
// from: "0.11.3"
21-
path: "../CodeEditTextView"
19+
url: "https://github.com/CodeEditApp/CodeEditTextView.git",
20+
from: "0.11.3"
2221
),
2322
// tree-sitter languages
2423
.package(

‎Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import Combine
1010
import CodeEditTextView
1111

1212
class FindPanelViewModel: ObservableObject {
13-
static let findPanelTextDidChangeNotification = Notification.Name("FindPanelViewModel.findPanelTextDidChange")
14-
// swiftlint:disable:next line_length
15-
static let findPanelReplaceTextDidChangeNotification = Notification.Name("FindPanelViewModel.findPanelReplaceTextDidChange")
16-
static let findPanelDidToggleNotification = Notification.Name("FindPanelViewModel.findPanelDidToggle")
13+
enum Notifications {
14+
static let textDidChange = Notification.Name("FindPanelViewModel.textDidChange")
15+
static let replaceTextDidChange = Notification.Name("FindPanelViewModel.replaceTextDidChange")
16+
static let didToggle = Notification.Name("FindPanelViewModel.didToggle")
17+
}
1718

1819
weak var target: FindPanelTarget?
1920
var dismiss: (() -> Void)?

‎Sources/CodeEditSourceEditor/SourceEditor/SourceEditor+Coordinator.swift‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,22 @@ extension SourceEditor {
3434
self.controller = controller
3535
// swiftlint:disable:next notification_center_detachment
3636
NotificationCenter.default.removeObserver(self)
37+
listenToTextViewNotifications(controller: controller)
38+
listenToCursorNotifications(controller: controller)
39+
listenToFindNotifications(controller: controller)
40+
}
41+
42+
// MARK: - Listeners
3743

44+
/// Listen to anything related to the text view.
45+
func listenToTextViewNotifications(controller: TextViewController) {
3846
NotificationCenter.default.addObserver(
3947
self,
4048
selector: #selector(textViewDidChangeText(_:)),
4149
name: TextView.textDidChangeNotification,
4250
object: controller.textView
4351
)
4452

45-
NotificationCenter.default.addObserver(
46-
self,
47-
selector: #selector(textControllerCursorsDidUpdate(_:)),
48-
name: TextViewController.cursorPositionUpdatedNotification,
49-
object: controller
50-
)
51-
5253
// Needs to be put on the main runloop or SwiftUI gets mad about updating state during view updates.
5354
NotificationCenter.default
5455
.publisher(
@@ -60,10 +61,23 @@ extension SourceEditor {
6061
self?.textControllerScrollDidChange(notification)
6162
}
6263
.store(in: &cancellables)
64+
}
6365

66+
/// Listen to the cursor publisher on the text view controller.
67+
func listenToCursorNotifications(controller: TextViewController) {
68+
NotificationCenter.default.addObserver(
69+
self,
70+
selector: #selector(textControllerCursorsDidUpdate(_:)),
71+
name: TextViewController.cursorPositionUpdatedNotification,
72+
object: controller
73+
)
74+
}
75+
76+
/// Listen to all find panel notifications.
77+
func listenToFindNotifications(controller: TextViewController) {
6478
NotificationCenter.default
6579
.publisher(
66-
for: FindPanelViewModel.findPanelTextDidChangeNotification,
80+
for: FindPanelViewModel.Notifications.textDidChange,
6781
object: controller
6882
)
6983
.receive(on: RunLoop.main)
@@ -74,7 +88,7 @@ extension SourceEditor {
7488

7589
NotificationCenter.default
7690
.publisher(
77-
for: FindPanelViewModel.findPanelReplaceTextDidChangeNotification,
91+
for: FindPanelViewModel.Notifications.replaceTextDidChange,
7892
object: controller
7993
)
8094
.receive(on: RunLoop.main)
@@ -85,7 +99,7 @@ extension SourceEditor {
8599

86100
NotificationCenter.default
87101
.publisher(
88-
for: FindPanelViewModel.findPanelDidToggleNotification,
102+
for: FindPanelViewModel.Notifications.didToggle,
89103
object: controller
90104
)
91105
.receive(on: RunLoop.main)
@@ -95,6 +109,8 @@ extension SourceEditor {
95109
.store(in: &cancellables)
96110
}
97111

112+
// MARK: - Update Published State
113+
98114
func updateHighlightProviders(_ highlightProviders: [any HighlightProviding]?) {
99115
guard let highlightProviders else {
100116
return // Keep our default `TreeSitterClient` if they're `nil`

‎Sources/CodeEditSourceEditor/SourceEditor/SourceEditor.swift‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -124,38 +124,7 @@ public struct SourceEditor: NSViewControllerRepresentable {
124124
context.coordinator.isUpdateFromTextView = false
125125
} else {
126126
context.coordinator.isUpdatingFromRepresentable = true
127-
if let cursorPositions = state.cursorPositions, cursorPositions != state.cursorPositions {
128-
controller.setCursorPositions(cursorPositions)
129-
}
130-
131-
if let scrollPosition = state.scrollPosition, scrollPosition != state.scrollPosition {
132-
controller.scrollView.scroll(controller.scrollView.contentView, to: scrollPosition)
133-
controller.scrollView.reflectScrolledClipView(controller.scrollView.contentView)
134-
controller.gutterView.needsDisplay = true
135-
NotificationCenter.default.post(name: NSView.frameDidChangeNotification, object: controller.textView)
136-
}
137-
138-
if let findText = state.findText, findText != controller.findViewController?.viewModel.findText {
139-
controller.findViewController?.viewModel.findText = findText
140-
}
141-
142-
if let replaceText = state.replaceText, replaceText != controller.findViewController?.viewModel.replaceText {
143-
controller.findViewController?.viewModel.replaceText = replaceText
144-
}
145-
146-
if let findPanelVisible = state.findPanelVisible,
147-
let findController = controller.findViewController,
148-
findController.viewModel.isShowingFindPanel != findPanelVisible {
149-
// Needs to be on the next runloop, not many great ways to do this besides a dispatch...
150-
DispatchQueue.main.async {
151-
if findPanelVisible {
152-
findController.showFindPanel()
153-
} else {
154-
findController.hideFindPanel()
155-
}
156-
}
157-
}
158-
127+
updateControllerWithState(state, controller: controller)
159128
context.coordinator.isUpdatingFromRepresentable = false
160129
}
161130

@@ -178,6 +147,40 @@ public struct SourceEditor: NSViewControllerRepresentable {
178147
return
179148
}
180149

150+
private func updateControllerWithState(_ state: SourceEditorState, controller: TextViewController) {
151+
if let cursorPositions = state.cursorPositions, cursorPositions != state.cursorPositions {
152+
controller.setCursorPositions(cursorPositions)
153+
}
154+
155+
if let scrollPosition = state.scrollPosition, scrollPosition != state.scrollPosition {
156+
controller.scrollView.scroll(controller.scrollView.contentView, to: scrollPosition)
157+
controller.scrollView.reflectScrolledClipView(controller.scrollView.contentView)
158+
controller.gutterView.needsDisplay = true
159+
NotificationCenter.default.post(name: NSView.frameDidChangeNotification, object: controller.textView)
160+
}
161+
162+
if let findText = state.findText, findText != controller.findViewController?.viewModel.findText {
163+
controller.findViewController?.viewModel.findText = findText
164+
}
165+
166+
if let replaceText = state.replaceText, replaceText != controller.findViewController?.viewModel.replaceText {
167+
controller.findViewController?.viewModel.replaceText = replaceText
168+
}
169+
170+
if let findPanelVisible = state.findPanelVisible,
171+
let findController = controller.findViewController,
172+
findController.viewModel.isShowingFindPanel != findPanelVisible {
173+
// Needs to be on the next runloop, not many great ways to do this besides a dispatch...
174+
DispatchQueue.main.async {
175+
if findPanelVisible {
176+
findController.showFindPanel()
177+
} else {
178+
findController.hideFindPanel()
179+
}
180+
}
181+
}
182+
}
183+
181184
private func updateHighlighting(_ controller: TextViewController, coordinator: Coordinator) {
182185
if !areHighlightProvidersEqual(controller: controller, coordinator: coordinator) {
183186
controller.setHighlightProviders(coordinator.highlightProviders)

0 commit comments

Comments
 (0)