feat: Find in Editor

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.pbxproj

@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		61621C612C74FB2200494A4A /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61621C602C74FB2200494A4A /* CodeEditSourceEditor */; };
+		61CE772F2D19BF7D00908C57 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */; };
+		61CE77322D19BFAA00908C57 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */; };
 		6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13652D2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift */; };
 		6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13652F2B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift */; };
 		6C1365322B8A7B94004A1D18 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365312B8A7B94004A1D18 /* ContentView.swift */; };
@@ -41,6 +43,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				61621C612C74FB2200494A4A /* CodeEditSourceEditor in Frameworks */,
+				61CE772F2D19BF7D00908C57 /* CodeEditSourceEditor in Frameworks */,
+				61CE77322D19BFAA00908C57 /* CodeEditSourceEditor in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -140,6 +144,8 @@
 			name = CodeEditSourceEditorExample;
 			packageProductDependencies = (
 				61621C602C74FB2200494A4A /* CodeEditSourceEditor */,
+				61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */,
+				61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */,
 			);
 			productName = CodeEditSourceEditorExample;
 			productReference = 6C13652A2B8A7B94004A1D18 /* CodeEditSourceEditorExample.app */;
@@ -412,6 +418,14 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = CodeEditSourceEditor;
 		};
+		61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CodeEditSourceEditor;
+		};
+		61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CodeEditSourceEditor;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 6C1365222B8A7B94004A1D18 /* Project object */;

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/CodeEditSourceEditorExampleApp.swift

@@ -13,5 +13,6 @@ struct CodeEditSourceEditorExampleApp: App {
         DocumentGroup(newDocument: CodeEditSourceEditorExampleDocument()) { file in
             ContentView(document: file.$document, fileURL: file.fileURL)
         }
+        .windowToolbarStyle(.unifiedCompact)
     }
 }

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

@@ -10,7 +10,7 @@ import AppKit
 import CodeEditSourceEditor
 
 extension EditorTheme {
-    static var standard: EditorTheme {
+    static var light: EditorTheme {
         EditorTheme(
             text: Attribute(color: NSColor(hex: "000000")),
             insertionPoint: NSColor(hex: "000000"),
@@ -25,9 +25,29 @@ extension EditorTheme {
             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),
+            strings: Attribute(color: NSColor(hex: "C41A16")),
             characters: Attribute(color: NSColor(hex: "1C00CF")),
-            comments: Attribute(color: NSColor(hex: "267507"), italic: true)
+            comments: Attribute(color: NSColor(hex: "267507"))
+        )
+    }
+    static var dark: EditorTheme {
+        EditorTheme(
+            text: Attribute(color: NSColor(hex: "FFFFFF")),
+            insertionPoint: NSColor(hex: "007AFF"),
+            invisibles: Attribute(color: NSColor(hex: "53606E")),
+            background: NSColor(hex: "292A30"),
+            lineHighlight: NSColor(hex: "2F3239"),
+            selection: NSColor(hex: "646F83"),
+            keywords: Attribute(color: NSColor(hex: "FF7AB2"), bold: true),
+            commands: Attribute(color: NSColor(hex: "78C2B3")),
+            types: Attribute(color: NSColor(hex: "6BDFFF")),
+            attributes: Attribute(color: NSColor(hex: "CC9768")),
+            variables: Attribute(color: NSColor(hex: "4EB0CC")),
+            values: Attribute(color: NSColor(hex: "B281EB")),
+            numbers: Attribute(color: NSColor(hex: "D9C97C")),
+            strings: Attribute(color: NSColor(hex: "FF8170")),
+            characters: Attribute(color: NSColor(hex: "D9C97C")),
+            comments: Attribute(color: NSColor(hex: "7F8C98"))
         )
     }
 }

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/ContentView.swift

@@ -11,82 +11,121 @@ import CodeEditLanguages
 import CodeEditTextView
 
 struct ContentView: View {
+    @Environment(\.colorScheme)
+    var colorScheme
+
     @Binding var document: CodeEditSourceEditorExampleDocument
     let fileURL: URL?
 
     @State private var language: CodeLanguage = .default
-    @State private var theme: EditorTheme = .standard
-    @State private var font: NSFont = NSFont.monospacedSystemFont(ofSize: 12, weight: .regular)
+    @State private var theme: EditorTheme = .light
+    @State private var font: NSFont = NSFont.monospacedSystemFont(ofSize: 12, weight: .medium)
     @AppStorage("wrapLines") private var wrapLines: Bool = true
-    @State private var cursorPositions: [CursorPosition] = []
+    @State private var cursorPositions: [CursorPosition] = [.init(line: 1, column: 1)]
     @AppStorage("systemCursor") private var useSystemCursor: Bool = false
     @State private var isInLongParse = false
+    @State private var settingsIsPresented: Bool = false
+    @State private var treeSitterClient = TreeSitterClient()
 
     init(document: Binding<CodeEditSourceEditorExampleDocument>, fileURL: URL?) {
         self._document = document
         self.fileURL = fileURL
     }
 
     var body: some View {
-        VStack(spacing: 0) {
-            HStack {
-                Text("Language")
-                LanguagePicker(language: $language)
-                    .frame(maxWidth: 100)
-                Toggle("Wrap Lines", isOn: $wrapLines)
-                if #available(macOS 14, *) {
-                    Toggle("Use System Cursor", isOn: $useSystemCursor)
-                } else {
-                    Toggle("Use System Cursor", isOn: $useSystemCursor)
-                        .disabled(true)
-                        .help("macOS 14 required")
+        GeometryReader { proxy in
+            CodeEditSourceEditor(
+                $document.text,
+                language: language,
+                theme: theme,
+                font: font,
+                tabWidth: 4,
+                lineHeight: 1.2,
+                wrapLines: wrapLines,
+                cursorPositions: $cursorPositions,
+                useThemeBackground: true,
+                highlightProviders: [treeSitterClient],
+                contentInsets: NSEdgeInsets(top: proxy.safeAreaInsets.top, left: 0, bottom: 28.0, right: 0),
+                useSystemCursor: useSystemCursor
+            )
+            .overlay(alignment: .bottom) {
+                HStack {
+                    Menu {
+                        Toggle("Wrap Lines", isOn: $wrapLines)
+                        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)
                 }
-                Spacer()
-                Text(getLabel(cursorPositions))
-            }
-            .padding(4)
-            .zIndex(2)
-            .background(Color(NSColor.windowBackgroundColor))
-            Divider()
-            ZStack {
-                if isInLongParse {
+                .font(.subheadline)
+                .fontWeight(.medium)
+                .controlSize(.small)
+                .padding(.horizontal, 8)
+                .frame(height: 28)
+                .background(.bar)
+                .overlay(alignment: .top) {
                     VStack {
-                        HStack {
-                            Spacer()
-                            Text("Parsing document...")
-                            Spacer()
-                        }
-                        .padding(4)
-                        .background(Color(NSColor.windowBackgroundColor))
-                        Spacer()
+                        Divider()
+                            .overlay {
+                                if colorScheme == .dark {
+                                    Color.black
+                                }
+                            }
                     }
-                    .zIndex(2)
-                    .transition(.opacity)
                 }
-                CodeEditSourceEditor(
-                    $document.text,
-                    language: language,
-                    theme: theme,
-                    font: font,
-                    tabWidth: 4,
-                    lineHeight: 1.2,
-                    wrapLines: wrapLines,
-                    cursorPositions: $cursorPositions,
-                    useSystemCursor: useSystemCursor
-                )
+                .zIndex(2)
+                .onAppear {
+                    self.language = detectLanguage(fileURL: fileURL) ?? .default
+                    self.theme = colorScheme == .dark ? .dark : .light
+                }
             }
-        }
-        .onAppear {
-            self.language = detectLanguage(fileURL: fileURL) ?? .default
-        }
-        .onReceive(NotificationCenter.default.publisher(for: TreeSitterClient.Constants.longParse)) { _ in
-            withAnimation(.easeIn(duration: 0.1)) {
-                isInLongParse = true
+            .ignoresSafeArea()
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .onReceive(NotificationCenter.default.publisher(for: TreeSitterClient.Constants.longParse)) { _ in
+                withAnimation(.easeIn(duration: 0.1)) {
+                    isInLongParse = true
+                }
             }
-        }
-        .onReceive(NotificationCenter.default.publisher(for: TreeSitterClient.Constants.longParseFinished)) { _ in
-            withAnimation(.easeIn(duration: 0.1)) {
-                isInLongParse = false
+            .onReceive(NotificationCenter.default.publisher(for: TreeSitterClient.Constants.longParseFinished)) { _ in
+                withAnimation(.easeIn(duration: 0.1)) {
+                    isInLongParse = false
+                }
+            }
+            .onChange(of: colorScheme) { _, newValue in
+                if newValue == .dark {
+                    theme = .dark
+                } else {
+                    theme = .light
+                }
             }
         }
     }
@@ -105,7 +144,7 @@ struct ContentView: View {
     /// - Returns: A string describing the user's location in a document.
     func getLabel(_ cursorPositions: [CursorPosition]) -> String {
         if cursorPositions.isEmpty {
-            return ""
+            return "No cursor"
         }
 
         // More than one selection, display the number of selections.

Package.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.8.1"
+            from: "0.8.2"
         ),
         // tree-sitter languages
         .package(