Skip to content

Respect the current formatting for new text entry #80

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Respect the current formatting for new text entry #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4c7b96
Set the default editor font from the rules
jbmorley May 9, 2024
683ab10
Ensure the typing attributes match the current text attributes
jbmorley Jun 13, 2024
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
11 changes: 9 additions & 2 deletions Sources/HighlightedTextEditor/HighlightedTextEditor.AppKit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public struct HighlightedTextEditor: NSViewRepresentable, HighlightingTextEditor

public func updateNSView(_ view: ScrollableTextView, context: Context) {
context.coordinator.updatingNSView = true
let typingAttributes = view.textView.typingAttributes

let highlightedText = HighlightedTextEditor.getHighlightedText(
text: text,
Expand All @@ -64,7 +63,15 @@ public struct HighlightedTextEditor: NSViewRepresentable, HighlightingTextEditor
view.attributedText = highlightedText
runIntrospect(view)
view.selectedRanges = context.coordinator.selectedRanges
view.textView.typingAttributes = typingAttributes

// Update the typing attributes to match the attributes at the current insertion point.
if highlightedText.length > 0, let insertionIndex = view.selectedRanges.first?.rangeValue.location {
let insertionIndex = max(0, min(insertionIndex, highlightedText.length - 1))
view.textView.typingAttributes = highlightedText.attributes(at: insertionIndex, effectiveRange: nil)
} else {
view.textView.typingAttributes = [.font: defaultEditorFont]
}

context.coordinator.updatingNSView = false
}

Expand Down