Merge branch 'main' into itembox

Author: FastestMolasses

.github/scripts/tests.sh

@@ -16,6 +16,6 @@ export LC_CTYPE=en_US.UTF-8
 set -o pipefail && arch -"${ARCH}" xcodebuild  \
            -scheme CodeEditSourceEditor \
            -derivedDataPath ".build" \
-           -destination "platform=macos,arch=${ARCH}" \
+           -destination "platform=macOS,arch=${ARCH},name=My Mac" \
            -skipPackagePluginValidation \
            clean test | xcpretty

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -29,6 +29,18 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CodeEditSourceEditorTests"
+               BuildableName = "CodeEditSourceEditorTests"
+               BlueprintName = "CodeEditSourceEditorTests"
+               ReferencedContainer = "container:../..">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/xcshareddata/xcschemes/CodeEditSourceEditorExample.xcscheme

@@ -12,22 +12,22 @@ import CodeEditSourceEditor
 extension EditorTheme {
     static var standard: EditorTheme {
         EditorTheme(
-            text: .init(hex: "000000"),
-            insertionPoint: .init(hex: "000000"),
-            invisibles: .init(hex: "D6D6D6"),
-            background: .init(hex: "FFFFFF"),
-            lineHighlight: .init(hex: "ECF5FF"),
-            selection: .init(hex: "B2D7FF"),
-            keywords: .init(hex: "9B2393"),
-            commands: .init(hex: "326D74"),
-            types: .init(hex: "0B4F79"),
-            attributes: .init(hex: "815F03"),
-            variables: .init(hex: "0F68A0"),
-            values: .init(hex: "6C36A9"),
-            numbers: .init(hex: "1C00CF"),
-            strings: .init(hex: "C41A16"),
-            characters: .init(hex: "1C00CF"),
-            comments: .init(hex: "267507")
+            text: Attribute(color: NSColor(hex: "000000")),
+            insertionPoint: NSColor(hex: "000000"),
+            invisibles: Attribute(color: NSColor(hex: "D6D6D6")),
+            background: NSColor(hex: "FFFFFF"),
+            lineHighlight: NSColor(hex: "ECF5FF"),
+            selection: NSColor(hex: "B2D7FF"),
+            keywords: Attribute(color: NSColor(hex: "9B2393"), bold: true),
+            commands: Attribute(color: NSColor(hex: "326D74")),
+            types: Attribute(color: NSColor(hex: "0B4F79")),
+            attributes: Attribute(color: NSColor(hex: "815F03")),
+            variables: Attribute(color: NSColor(hex: "0F68A0")),
+            values: Attribute(color: NSColor(hex: "6C36A9")),
+            numbers: Attribute(color: NSColor(hex: "1C00CF")),
+            strings: Attribute(color: NSColor(hex: "C41A16"), bold: true, italic: true),
+            characters: Attribute(color: NSColor(hex: "1C00CF")),
+            comments: Attribute(color: NSColor(hex: "267507"), italic: true)
         )
     }
 }

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Extensions/EditorTheme+Default.swift

@@ -17,7 +17,7 @@ let package = Package(
         // A fast, efficient, text view for code.
         .package(
             url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-            from: "0.7.7"
+            from: "0.8.1"
         ),
         // tree-sitter languages
         .package(

Package.resolved

@@ -57,7 +57,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         editorOverscroll: CGFloat = 0,
         cursorPositions: Binding<[CursorPosition]>,
         useThemeBackground: Bool = true,
-        highlightProviders: [HighlightProviding] = [TreeSitterClient()],
+        highlightProviders: [any HighlightProviding] = [TreeSitterClient()],
         contentInsets: NSEdgeInsets? = nil,
         isEditable: Bool = true,
         isSelectable: Bool = true,
@@ -132,7 +132,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         editorOverscroll: CGFloat = 0,
         cursorPositions: Binding<[CursorPosition]>,
         useThemeBackground: Bool = true,
-        highlightProviders: [HighlightProviding] = [TreeSitterClient()],
+        highlightProviders: [any HighlightProviding] = [TreeSitterClient()],
         contentInsets: NSEdgeInsets? = nil,
         isEditable: Bool = true,
         isSelectable: Bool = true,
@@ -179,7 +179,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     private var editorOverscroll: CGFloat
     package var cursorPositions: Binding<[CursorPosition]>
     private var useThemeBackground: Bool
-    private var highlightProviders: [HighlightProviding]
+    private var highlightProviders: [any HighlightProviding]
     private var contentInsets: NSEdgeInsets?
     private var isEditable: Bool
     private var isSelectable: Bool
@@ -305,6 +305,10 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
             controller.useSystemCursor = useSystemCursor
         }
 
+        if !areHighlightProvidersEqual(controller: controller) {
+            controller.setHighlightProviders(highlightProviders)
+        }
+
         controller.bracketPairHighlight = bracketPairHighlight
     }
 
@@ -326,7 +330,12 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         controller.tabWidth == tabWidth &&
         controller.letterSpacing == letterSpacing &&
         controller.bracketPairHighlight == bracketPairHighlight &&
-        controller.useSystemCursor == useSystemCursor
+        controller.useSystemCursor == useSystemCursor &&
+        areHighlightProvidersEqual(controller: controller)
+    }
+
+    private func areHighlightProvidersEqual(controller: TextViewController) -> Bool {
+        controller.highlightProviders.map { ObjectIdentifier($0) } == highlightProviders.map { ObjectIdentifier($0) }
     }
 }
 

Package.swift

@@ -9,7 +9,7 @@ import Foundation
 import SwiftTreeSitter
 
 extension TextViewController {
-    internal func setUpHighlighter() {
+    package func setUpHighlighter() {
         if let highlighter {
             textView.removeStorageDelegate(highlighter)
             self.highlighter = nil
@@ -24,12 +24,23 @@ extension TextViewController {
         textView.addStorageDelegate(highlighter)
         self.highlighter = highlighter
     }
+
+    /// Sets new highlight providers. Recognizes when objects move in the array or are removed or inserted.
+    ///
+    /// This is in place of a setter on the ``highlightProviders`` variable to avoid wasting resources setting up
+    /// providers early.
+    ///
+    /// - Parameter newProviders: All the new providers.
+    package func setHighlightProviders(_ newProviders: [HighlightProviding]) {
+        highlighter?.setProviders(newProviders)
+        highlightProviders = newProviders
+    }
 }
 
 extension TextViewController: ThemeAttributesProviding {
     public func attributesFor(_ capture: CaptureName?) -> [NSAttributedString.Key: Any] {
         [
-            .font: font,
+            .font: theme.fontFor(for: capture, from: font),
             .foregroundColor: theme.colorFor(capture),
             .kern: textView.kern
         ]

Sources/CodeEditSourceEditor/CodeEditSourceEditor/CodeEditSourceEditor.swift

@@ -1,12 +1,12 @@
 //
 //  TextViewController+IndentLines.swift
-//
+//  CodeEditTextView
 //
 //  Created by Ludwig, Tom on 11.09.24.
 //
 
-import CodeEditTextView
 import AppKit
+import CodeEditTextView
 
 extension TextViewController {
     /// Handles indentation and unindentation

Sources/CodeEditSourceEditor/Controller/TextViewController+Highlighter.swift

@@ -6,6 +6,7 @@
 //
 
 import AppKit
+import CodeEditTextView
 
 extension TextViewController {
     package func generateParagraphStyle() -> NSMutableParagraphStyle {
@@ -66,6 +67,6 @@ extension TextViewController {
         } else {
             scrollView.automaticallyAdjustsContentInsets = true
         }
-        scrollView.contentInsets.bottom = (contentInsets?.bottom ?? 0) + bottomContentInsets
+        scrollView.contentInsets.bottom = contentInsets?.bottom ?? 0
     }
 }