Merge branch 'main' into feat/find-in-replace-refactor

Author: thecoolwinter

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB30C392DAA1C28008058A7 /* IndentPicker.swift */; };
 		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 */; };
@@ -19,9 +20,11 @@
 		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 */; };
+		6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF31D4D2DB6A252006A77FD /* StatusBar.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		1CB30C392DAA1C28008058A7 /* IndentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndentPicker.swift; sourceTree = "<group>"; };
 		6C13652A2B8A7B94004A1D18 /* CodeEditSourceEditorExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CodeEditSourceEditorExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6C13652D2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditSourceEditorExampleApp.swift; sourceTree = "<group>"; };
 		6C13652F2B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditSourceEditorExampleDocument.swift; sourceTree = "<group>"; };
@@ -35,6 +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>"; };
+		6CF31D4D2DB6A252006A77FD /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -113,7 +117,9 @@
 			isa = PBXGroup;
 			children = (
 				6C1365312B8A7B94004A1D18 /* ContentView.swift */,
+				6CF31D4D2DB6A252006A77FD /* StatusBar.swift */,
 				6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */,
+				1CB30C392DAA1C28008058A7 /* IndentPicker.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -206,8 +212,10 @@
 				6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */,
 				6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */,
 				6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */,
+				6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */,
 				6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */,
 				6C1365442B8A7EED004A1D18 /* String+Lines.swift in Sources */,
+				1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */,
 				6C1365322B8A7B94004A1D18 /* ContentView.swift in Sources */,
 				6C1365462B8A7F2D004A1D18 /* LanguagePicker.swift in Sources */,
 			);

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

@@ -26,6 +26,8 @@ struct ContentView: View {
     @State private var isInLongParse = false
     @State private var settingsIsPresented: Bool = false
     @State private var treeSitterClient = TreeSitterClient()
+    @AppStorage("showMinimap") private var showMinimap: Bool = true
+    @State private var indentOption: IndentOption = .spaces(count: 4)
 
     init(document: Binding<CodeEditSourceEditorExampleDocument>, fileURL: URL?) {
         self._document = document
@@ -40,73 +42,31 @@ struct ContentView: View {
                 theme: theme,
                 font: font,
                 tabWidth: 4,
+                indentOption: indentOption,
                 lineHeight: 1.2,
                 wrapLines: wrapLines,
+                editorOverscroll: 0.3,
                 cursorPositions: $cursorPositions,
                 useThemeBackground: true,
                 highlightProviders: [treeSitterClient],
                 contentInsets: NSEdgeInsets(top: proxy.safeAreaInsets.top, left: 0, bottom: 28.0, right: 0),
-                useSystemCursor: useSystemCursor
+                additionalTextInsets: NSEdgeInsets(top: 1, left: 0, bottom: 1, right: 0),
+                useSystemCursor: useSystemCursor,
+                showMinimap: showMinimap
             )
             .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)
-                }
-                .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
-                }
+                StatusBar(
+                    fileURL: fileURL,
+                    document: $document,
+                    wrapLines: $wrapLines,
+                    useSystemCursor: $useSystemCursor,
+                    cursorPositions: $cursorPositions,
+                    isInLongParse: $isInLongParse,
+                    language: $language,
+                    theme: $theme,
+                    showMinimap: $showMinimap,
+                    indentOption: $indentOption
+                )
             }
             .ignoresSafeArea()
             .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -129,32 +89,6 @@ struct ContentView: View {
             }
         }
     }
-
-    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)"
-    }
 }
 
 #Preview {

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/ContentView.swift

@@ -0,0 +1,42 @@
+import SwiftUI
+import CodeEditSourceEditor
+
+struct IndentPicker: View {
+    @Binding var indentOption: IndentOption
+    let enabled: Bool
+
+    private let possibleIndents: [IndentOption] = [
+        .spaces(count: 4),
+        .spaces(count: 2),
+        .tab
+    ]
+
+    var body: some View {
+        Picker(
+            "Indent",
+            selection: $indentOption
+        ) {
+            ForEach(possibleIndents, id: \.optionDescription) { indent in
+                Text(indent.optionDescription)
+                    .tag(indent)
+            }
+        }
+        .labelsHidden()
+        .disabled(!enabled)
+    }
+}
+
+extension IndentOption {
+    var optionDescription: String {
+        switch self {
+        case .spaces(count: let count):
+            return "Spaces (\(count))"
+        case .tab:
+            return "Tab"
+        }
+    }
+}
+
+#Preview {
+    IndentPicker(indentOption: .constant(.spaces(count: 4)), enabled: true)
+}