Skip to content

[chore:] Update CodeEditTextView to 0.11.0 #318

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

Merged
thecoolwinter merged 1 commit into from
May 27, 2025
Merged

[chore:] Update CodeEditTextView to 0.11.0 #318

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
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let package = Package(
// A fast, efficient, text view for code.
.package(
url: "https://github.com/CodeEditApp/CodeEditTextView.git",
from: "0.10.1"
from: "0.11.0"
),
// tree-sitter languages
.package(
Expand Down
5 changes: 1 addition & 4 deletions Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ extension TextViewController {
object: scrollView.contentView,
queue: .main
) { [weak self] notification in
guard let clipView = notification.object as? NSClipView,
let textView = self?.textView else { return }
textView.updatedViewport(self?.scrollView.documentVisibleRect ?? .zero)
guard let clipView = notification.object as? NSClipView else { return }
self?.gutterView.needsDisplay = true
self?.minimapXConstraint?.constant = clipView.bounds.origin.x
}
Expand All @@ -120,7 +118,6 @@ extension TextViewController {
object: scrollView.contentView,
queue: .main
) { [weak self] _ in
self?.textView.updatedViewport(self?.scrollView.documentVisibleRect ?? .zero)
self?.gutterView.needsDisplay = true
self?.emphasisManager?.removeEmphases(for: EmphasisGroup.brackets)
self?.updateTextInsets()
Expand Down
12 changes: 9 additions & 3 deletions Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
range: NSRange,
stringRef: NSTextStorage,
markedRanges: MarkedRanges?,
breakStrategy: LineBreakStrategy
lineBreakStrategy: LineBreakStrategy
) {
let maxWidth: CGFloat = if let textView, textView.wrapLines {
textView.layoutManager.maxLineLayoutWidth
Expand All @@ -34,7 +34,7 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
range: range,
stringRef: stringRef,
markedRanges: markedRanges,
breakStrategy: breakStrategy
attachments: []
)

// Make all fragments 2px tall
Expand Down Expand Up @@ -62,6 +62,12 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {

func characterXPosition(in lineFragment: LineFragment, for offset: Int) -> CGFloat {
// Offset is relative to the whole line, the CTLine is too.
return 8 + (CGFloat(offset - CTLineGetStringRange(lineFragment.ctLine).location) * 1.5)
guard let content = lineFragment.contents.first else { return 0.0 }
switch content.data {
case .text(let ctLine):
return 8 + (CGFloat(offset - CTLineGetStringRange(ctLine).location) * 1.5)
case .attachment:
return 0.0
}
}
}