Merge branch 'main' into fix/highlighter-highlight-minimap-viewport

Author: thecoolwinter

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.pbxproj

@@ -20,7 +20,7 @@
 		6C1365462B8A7F2D004A1D18 /* LanguagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */; };
 		6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365472B8A7FBF004A1D18 /* EditorTheme+Default.swift */; };
 		6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13654C2B8A821E004A1D18 /* NSColor+Hex.swift */; };
-		6C2EE57E2DB1522E007E0A26 /* Toolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C2EE57D2DB1522E007E0A26 /* Toolbar.swift */; };
+		6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF31D4D2DB6A252006A77FD /* StatusBar.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -38,7 +38,7 @@
 		6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguagePicker.swift; sourceTree = "<group>"; };
 		6C1365472B8A7FBF004A1D18 /* EditorTheme+Default.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EditorTheme+Default.swift"; sourceTree = "<group>"; };
 		6C13654C2B8A821E004A1D18 /* NSColor+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSColor+Hex.swift"; sourceTree = "<group>"; };
-		6C2EE57D2DB1522E007E0A26 /* Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toolbar.swift; sourceTree = "<group>"; };
+		6CF31D4D2DB6A252006A77FD /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -117,7 +117,7 @@
 			isa = PBXGroup;
 			children = (
 				6C1365312B8A7B94004A1D18 /* ContentView.swift */,
-				6C2EE57D2DB1522E007E0A26 /* Toolbar.swift */,
+				6CF31D4D2DB6A252006A77FD /* StatusBar.swift */,
 				6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */,
 				1CB30C392DAA1C28008058A7 /* IndentPicker.swift */,
 			);
@@ -212,7 +212,7 @@
 				6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */,
 				6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */,
 				6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */,
-				6C2EE57E2DB1522E007E0A26 /* Toolbar.swift in Sources */,
+				6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */,
 				6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */,
 				6C1365442B8A7EED004A1D18 /* String+Lines.swift in Sources */,
 				1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */,

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

@@ -55,7 +55,7 @@ struct ContentView: View {
                 showMinimap: showMinimap
             )
             .overlay(alignment: .bottom) {
-                Toolbar(
+                StatusBar(
                     fileURL: fileURL,
                     document: $document,
                     wrapLines: $wrapLines,

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/ContentView.swift

@@ -0,0 +1,119 @@
+//
+//  StatusBar.swift
+//  CodeEditSourceEditorExample
+//
+//  Created by Khan Winter on 4/17/25.
+//
+
+import SwiftUI
+import CodeEditSourceEditor
+import CodeEditLanguages
+
+struct StatusBar: View {
+    let fileURL: URL?
+
+    @Environment(\.colorScheme)
+    var colorScheme
+
+    @Binding var document: CodeEditSourceEditorExampleDocument
+    @Binding var wrapLines: Bool
+    @Binding var useSystemCursor: Bool
+    @Binding var cursorPositions: [CursorPosition]
+    @Binding var isInLongParse: Bool
+    @Binding var language: CodeLanguage
+    @Binding var theme: EditorTheme
+    @Binding var showMinimap: Bool
+    @Binding var indentOption: IndentOption
+
+    var body: some View {
+        HStack {
+            Menu {
+                Toggle("Wrap Lines", isOn: $wrapLines)
+                Toggle("Show Minimap", isOn: $showMinimap)
+                if #available(macOS 14, *) {
+                    Toggle("Use System Cursor", isOn: $useSystemCursor)
+                } else {
+                    Toggle("Use System Cursor", isOn: $useSystemCursor)
+                        .disabled(true)
+                        .help("macOS 14 required")
+                }
+            } label: {}
+                .background {
+                    Image(systemName: "switch.2")
+                        .foregroundStyle(.secondary)
+                        .font(.system(size: 13.5, weight: .regular))
+                }
+                .menuStyle(.borderlessButton)
+                .menuIndicator(.hidden)
+                .frame(maxWidth: 18, alignment: .center)
+
+            Spacer()
+
+            Group {
+                if isInLongParse {
+                    HStack(spacing: 5) {
+                        ProgressView()
+                            .controlSize(.small)
+                        Text("Parsing Document")
+                    }
+                } else {
+                    Text(getLabel(cursorPositions))
+                }
+            }
+            .foregroundStyle(.secondary)
+            Divider()
+                .frame(height: 12)
+            LanguagePicker(language: $language)
+                .buttonStyle(.borderless)
+            IndentPicker(indentOption: $indentOption, enabled: document.text.isEmpty)
+                .buttonStyle(.borderless)
+        }
+        .font(.subheadline)
+        .fontWeight(.medium)
+        .controlSize(.small)
+        .padding(.horizontal, 8)
+        .frame(height: 28)
+        .background(.bar)
+        .overlay(alignment: .top) {
+            VStack {
+                Divider()
+                    .overlay {
+                        if colorScheme == .dark {
+                            Color.black
+                        }
+                    }
+            }
+        }
+        .zIndex(2)
+        .onAppear {
+            self.language = detectLanguage(fileURL: fileURL) ?? .default
+            self.theme = colorScheme == .dark ? .dark : .light
+        }
+    }
+
+    private func detectLanguage(fileURL: URL?) -> CodeLanguage? {
+        guard let fileURL else { return nil  }
+        return CodeLanguage.detectLanguageFrom(
+            url: fileURL,
+            prefixBuffer: document.text.getFirstLines(5),
+            suffixBuffer: document.text.getLastLines(5)
+        )
+    }
+
+    /// Create a label string for cursor positions.
+    /// - Parameter cursorPositions: The cursor positions to create the label for.
+    /// - Returns: A string describing the user's location in a document.
+    func getLabel(_ cursorPositions: [CursorPosition]) -> String {
+        if cursorPositions.isEmpty {
+            return "No cursor"
+        }
+
+        // More than one selection, display the number of selections.
+        if cursorPositions.count > 1 {
+            return "\(cursorPositions.count) selected ranges"
+        }
+
+        // When there's a single cursor, display the line and column.
+        return "Line: \(cursorPositions[0].line)  Col: \(cursorPositions[0].column) Range: \(cursorPositions[0].range)"
+    }
+}

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/StatusBar.swift

@@ -16,9 +16,8 @@ let package = Package(
     dependencies: [
         // A fast, efficient, text view for code.
         .package(
-//            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-//            from: "0.9.1"
-            path: "../CodeEditTextView"
+            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
+            from: "0.10.1"
         ),
         // tree-sitter languages
         .package(

Package.resolved

@@ -18,9 +18,12 @@ extension CodeEditSourceEditor {
         var text: TextAPI
         @Binding var cursorPositions: [CursorPosition]
 
-        init(text: TextAPI, cursorPositions: Binding<[CursorPosition]>) {
+        private(set) var highlightProviders: [any HighlightProviding]
+
+        init(text: TextAPI, cursorPositions: Binding<[CursorPosition]>, highlightProviders: [any HighlightProviding]?) {
             self.text = text
             self._cursorPositions = cursorPositions
+            self.highlightProviders = highlightProviders ?? [TreeSitterClient()]
             super.init()
 
             NotificationCenter.default.addObserver(
@@ -38,6 +41,14 @@ extension CodeEditSourceEditor {
             )
         }
 
+        func updateHighlightProviders(_ highlightProviders: [any HighlightProviding]?) {
+            guard let highlightProviders else {
+                return // Keep our default `TreeSitterClient` if they're `nil`
+            }
+            // Otherwise, we can replace the stored providers.
+            self.highlightProviders = highlightProviders
+        }
+
         @objc func textViewDidChangeText(_ notification: Notification) {
             guard let textView = notification.object as? TextView,
                   let controller,

Package.swift

@@ -35,8 +35,8 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     ///   - cursorPositions: The cursor's position in the editor, measured in `(lineNum, columnNum)`
     ///   - useThemeBackground: Determines whether the editor uses the theme's background color, or a transparent
     ///                         background color
-    ///   - highlightProvider: A class you provide to perform syntax highlighting. Leave this as `nil` to use the
-    ///                        built-in `TreeSitterClient` highlighter.
+    ///   - highlightProviders: A set of classes you provide to perform syntax highlighting. Leave this as `nil` to use
+    ///                         the default `TreeSitterClient` highlighter.
     ///   - contentInsets: Insets to use to offset the content in the enclosing scroll view. Leave as `nil` to let the
     ///                    scroll view automatically adjust content insets.
     ///   - additionalTextInsets: An additional amount to inset the text of the editor by.
@@ -62,7 +62,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         editorOverscroll: CGFloat = 0,
         cursorPositions: Binding<[CursorPosition]>,
         useThemeBackground: Bool = true,
-        highlightProviders: [any HighlightProviding] = [TreeSitterClient()],
+        highlightProviders: [any HighlightProviding]? = nil,
         contentInsets: NSEdgeInsets? = nil,
         additionalTextInsets: NSEdgeInsets? = nil,
         isEditable: Bool = true,
@@ -116,8 +116,8 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     ///   - cursorPositions: The cursor's position in the editor, measured in `(lineNum, columnNum)`
     ///   - useThemeBackground: Determines whether the editor uses the theme's background color, or a transparent
     ///                         background color
-    ///   - highlightProvider: A class you provide to perform syntax highlighting. Leave this as `nil` to use the
-    ///                        built-in `TreeSitterClient` highlighter.
+    ///   - highlightProviders: A set of classes you provide to perform syntax highlighting. Leave this as `nil` to use
+    ///                         the default `TreeSitterClient` highlighter.
     ///   - contentInsets: Insets to use to offset the content in the enclosing scroll view. Leave as `nil` to let the
     ///                    scroll view automatically adjust content insets.
     ///   - isEditable: A Boolean value that controls whether the text view allows the user to edit text.
@@ -141,7 +141,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         editorOverscroll: CGFloat = 0,
         cursorPositions: Binding<[CursorPosition]>,
         useThemeBackground: Bool = true,
-        highlightProviders: [any HighlightProviding] = [TreeSitterClient()],
+        highlightProviders: [any HighlightProviding]? = nil,
         contentInsets: NSEdgeInsets? = nil,
         additionalTextInsets: NSEdgeInsets? = nil,
         isEditable: Bool = true,
@@ -192,7 +192,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     private var editorOverscroll: CGFloat
     package var cursorPositions: Binding<[CursorPosition]>
     private var useThemeBackground: Bool
-    private var highlightProviders: [any HighlightProviding]
+    private var highlightProviders: [any HighlightProviding]?
     private var contentInsets: NSEdgeInsets?
     private var additionalTextInsets: NSEdgeInsets?
     private var isEditable: Bool
@@ -219,7 +219,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
             cursorPositions: cursorPositions.wrappedValue,
             editorOverscroll: editorOverscroll,
             useThemeBackground: useThemeBackground,
-            highlightProviders: highlightProviders,
+            highlightProviders: context.coordinator.highlightProviders,
             contentInsets: contentInsets,
             additionalTextInsets: additionalTextInsets,
             isEditable: isEditable,
@@ -249,10 +249,12 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     }
 
     public func makeCoordinator() -> Coordinator {
-        Coordinator(text: text, cursorPositions: cursorPositions)
+        Coordinator(text: text, cursorPositions: cursorPositions, highlightProviders: highlightProviders)
     }
 
     public func updateNSViewController(_ controller: TextViewController, context: Context) {
+        context.coordinator.updateHighlightProviders(highlightProviders)
+
         if !context.coordinator.isUpdateFromTextView {
             // Prevent infinite loop of update notifications
             context.coordinator.isUpdatingFromRepresentable = true
@@ -267,23 +269,23 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
 
         // Do manual diffing to reduce the amount of reloads.
         // This helps a lot in view performance, as it otherwise gets triggered on each environment change.
-        guard !paramsAreEqual(controller: controller) else {
+        guard !paramsAreEqual(controller: controller, coordinator: context.coordinator) else {
             return
         }
 
-        updateControllerParams(controller: controller)
+        updateControllerParams(controller: controller, coordinator: context.coordinator)
 
         controller.reloadUI()
         return
     }
 
     /// Update the parameters of the controller.
     /// - Parameter controller: The controller to update.
-    func updateControllerParams(controller: TextViewController) {
+    func updateControllerParams(controller: TextViewController, coordinator: Coordinator) {
         updateTextProperties(controller)
         updateEditorProperties(controller)
         updateThemeAndLanguage(controller)
-        updateHighlighting(controller)
+        updateHighlighting(controller, coordinator: coordinator)
     }
 
     private func updateTextProperties(_ controller: TextViewController) {
@@ -336,9 +338,9 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         }
     }
 
-    private func updateHighlighting(_ controller: TextViewController) {
-        if !areHighlightProvidersEqual(controller: controller) {
-            controller.setHighlightProviders(highlightProviders)
+    private func updateHighlighting(_ controller: TextViewController, coordinator: Coordinator) {
+        if !areHighlightProvidersEqual(controller: controller, coordinator: coordinator) {
+            controller.setHighlightProviders(coordinator.highlightProviders)
         }
 
         if controller.bracketPairEmphasis != bracketPairEmphasis {
@@ -349,7 +351,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     /// Checks if the controller needs updating.
     /// - Parameter controller: The controller to check.
     /// - Returns: True, if the controller's parameters should be updated.
-    func paramsAreEqual(controller: NSViewControllerType) -> Bool {
+    func paramsAreEqual(controller: NSViewControllerType, coordinator: Coordinator) -> Bool {
         controller.font == font &&
         controller.isEditable == isEditable &&
         controller.isSelectable == isSelectable &&
@@ -367,11 +369,12 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         controller.bracketPairEmphasis == bracketPairEmphasis &&
         controller.useSystemCursor == useSystemCursor &&
         controller.showMinimap == showMinimap &&
-        areHighlightProvidersEqual(controller: controller)
+        areHighlightProvidersEqual(controller: controller, coordinator: coordinator)
     }
 
-    private func areHighlightProvidersEqual(controller: TextViewController) -> Bool {
-        controller.highlightProviders.map { ObjectIdentifier($0) } == highlightProviders.map { ObjectIdentifier($0) }
+    private func areHighlightProvidersEqual(controller: TextViewController, coordinator: Coordinator) -> Bool {
+        controller.highlightProviders.map { ObjectIdentifier($0) }
+        == coordinator.highlightProviders.map { ObjectIdentifier($0) }
     }
 }