Source Control Settings

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager+DirectoryEvents.swift

@@ -30,7 +30,7 @@ extension CEWorkspaceFileManager {
                     // Can be ignored for now, these I think not related to tree changes
                     continue
                 case .rootChanged:
-                    // TODO: Handle workspace root changing.
+                    // TODO: #1880 - Handle workspace root changing.
                     continue
                 case .itemCreated, .itemCloned, .itemRemoved, .itemRenamed:
                     for fileItem in fileItems {
@@ -48,7 +48,10 @@ extension CEWorkspaceFileManager {
                 self.notifyObservers(updatedItems: files)
             }
 
-            self.handleGitEvents(events: events)
+            if Settings.shared.preferences.sourceControl.general.enableSourceControl &&
+                Settings.shared.preferences.sourceControl.general.refreshStatusLocally {
+                self.handleGitEvents(events: events)
+            }
         }
     }
 

CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

@@ -71,8 +71,10 @@ struct ToolbarBranchPicker: View {
             isHovering = active
         }
         .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { (_) in
-            Task {
-                await sourceControlManager?.refreshCurrentBranch()
+            if self.currentBranch != nil {
+                Task {
+                    await sourceControlManager?.refreshCurrentBranch()
+                }
             }
         }
         .onReceive(
@@ -82,8 +84,10 @@ struct ToolbarBranchPicker: View {
             self.currentBranch = branch
         }
         .task {
-            await self.sourceControlManager?.refreshCurrentBranch()
-            await self.sourceControlManager?.refreshBranches()
+            if Settings.shared.preferences.sourceControl.general.enableSourceControl {
+                await self.sourceControlManager?.refreshCurrentBranch()
+                await self.sourceControlManager?.refreshBranches()
+            }
         }
     }
 

CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorModel.swift

@@ -40,7 +40,11 @@ final class HistoryInspectorModel: ObservableObject {
         do {
             let commitHistory = try await sourceControlManager
                 .gitClient
-                .getCommitHistory(maxCount: 40, fileLocalPath: fileURL)
+                .getCommitHistory(
+                    maxCount: 40,
+                    fileLocalPath: fileURL,
+                    showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
+                )
             await setCommitHistory(commitHistory)
         } catch {
             await setCommitHistory([])

CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorView.swift

@@ -7,6 +7,9 @@
 import SwiftUI
 
 struct HistoryInspectorView: View {
+    @AppSettings(\.sourceControl.git.showMergeCommitsPerFileLog)
+    var showMergeCommitsPerFileLog
+
     @EnvironmentObject private var workspace: WorkspaceDocument
 
     @EnvironmentObject private var editorManager: EditorManager
@@ -60,5 +63,10 @@ struct HistoryInspectorView: View {
             await model.setWorkspace(sourceControlManager: workspace.sourceControlManager)
             await model.setFile(url: editorManager.activeEditor.selectedTab?.file.url.path)
         }
+        .onChange(of: showMergeCommitsPerFileLog) { _ in
+            Task {
+                await model.updateCommitHistory()
+            }
+        }
     }
 }

CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift

@@ -1,10 +1,3 @@
-//
-//  InspectorAreaView.swift
-//  CodeEdit
-//
-//  Created by Austin Condiff on 3/21/22.
-//
-
 import SwiftUI
 
 struct InspectorAreaView: View {
@@ -15,26 +8,17 @@ struct InspectorAreaView: View {
 
     @EnvironmentObject private var editorManager: EditorManager
 
+    @AppSettings(\.sourceControl.general.enableSourceControl)
+    private var enableSourceControl: Bool
+
     @AppSettings(\.general.inspectorTabBarPosition)
     var sidebarPosition: SettingsData.SidebarTabBarPosition
 
     @State private var selection: InspectorTab? = .file
 
     init(viewModel: InspectorAreaViewModel) {
         self.viewModel = viewModel
-
-        viewModel.tabItems = [.file, .gitHistory]
-        viewModel.tabItems += extensionManager
-            .extensions
-            .map { ext in
-                ext.availableFeatures.compactMap {
-                    if case .sidebarItem(let data) = $0, data.kind == .inspector {
-                        return InspectorTab.uiExtension(endpoint: ext.endpoint, data: data)
-                    }
-                    return nil
-                }
-            }
-            .joined()
+        updateTabItems()
     }
 
     func getExtension(_ id: String) -> ExtensionInfo? {
@@ -73,5 +57,28 @@ struct InspectorAreaView: View {
         .formStyle(.grouped)
         .accessibilityElement(children: .contain)
         .accessibilityLabel("inspector")
+        .onChange(of: enableSourceControl) { _ in
+            updateTabItems()
+        }
+    }
+
+    private func updateTabItems() {
+        viewModel.tabItems = [.file] +
+            (enableSourceControl ? [.gitHistory] : []) +
+            extensionManager
+                .extensions
+                .flatMap { ext in
+                    ext.availableFeatures.compactMap {
+                        if case .sidebarItem(let data) = $0, data.kind == .inspector {
+                            return InspectorTab.uiExtension(endpoint: ext.endpoint, data: data)
+                        }
+                        return nil
+                    }
+                }
+        if let selectedTab = selection,
+            !viewModel.tabItems.isEmpty &&
+            !viewModel.tabItems.contains(selectedTab) {
+            selection = viewModel.tabItems[0]
+        }
     }
 }

CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift

@@ -15,6 +15,9 @@ struct SourceControlNavigatorHistoryView: View {
         case error(error: Error)
     }
 
+    @AppSettings(\.sourceControl.git.showMergeCommitsPerFileLog)
+    var showMergeCommitsPerFileLog
+
     @EnvironmentObject var sourceControlManager: SourceControlManager
 
     @State var commitHistoryStatus: Status = .loading
@@ -28,7 +31,10 @@ struct SourceControlNavigatorHistoryView: View {
             commitHistoryStatus = .loading
             let commits = try await sourceControlManager
                 .gitClient
-                .getCommitHistory(branchName: sourceControlManager.currentBranch?.name)
+                .getCommitHistory(
+                    branchName: sourceControlManager.currentBranch?.name,
+                    showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
+                )
             await MainActor.run {
                 commitHistory = commits
                 commitHistoryStatus = .ready
@@ -102,5 +108,10 @@ struct SourceControlNavigatorHistoryView: View {
         .task {
             await updateCommitHistory()
         }
+        .onChange(of: showMergeCommitsPerFileLog) { _ in
+            Task {
+                await updateCommitHistory()
+            }
+        }
     }
 }

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Views/SourceControlNavigatorView.swift

@@ -10,6 +10,9 @@ import SwiftUI
 struct SourceControlNavigatorView: View {
     @EnvironmentObject private var workspace: WorkspaceDocument
 
+    @AppSettings(\.sourceControl.general.fetchRefreshServerStatus)
+    var fetchRefreshServerStatus
+
     var body: some View {
         if let sourceControlManager = workspace.workspaceFileManager?.sourceControlManager {
             VStack(spacing: 0) {
@@ -18,7 +21,9 @@ struct SourceControlNavigatorView: View {
                     .task {
                         do {
                             while true {
-                                try await sourceControlManager.fetch()
+                                if fetchRefreshServerStatus {
+                                    try await sourceControlManager.fetch()
+                                }
                                 try await Task.sleep(for: .seconds(10))
                             }
                         } catch {

CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift

@@ -15,22 +15,13 @@ struct NavigatorAreaView: View {
     @AppSettings(\.general.navigatorTabBarPosition)
     var sidebarPosition: SettingsData.SidebarTabBarPosition
 
+    @AppSettings(\.sourceControl.general.enableSourceControl)
+    private var enableSourceControl: Bool
+
     init(workspace: WorkspaceDocument, viewModel: NavigatorSidebarViewModel) {
         self.workspace = workspace
         self.viewModel = viewModel
-
-        viewModel.tabItems = [.project, .sourceControl, .search] +
-        extensionManager
-            .extensions
-            .map { ext in
-                ext.availableFeatures.compactMap {
-                    if case .sidebarItem(let data) = $0, data.kind == .navigator {
-                        return NavigatorTab.uiExtension(endpoint: ext.endpoint, data: data)
-                    }
-                    return nil
-                }
-            }
-            .joined()
+        updateTabItems()
     }
 
     var body: some View {
@@ -63,5 +54,29 @@ struct NavigatorAreaView: View {
         .environmentObject(workspace)
         .accessibilityElement(children: .contain)
         .accessibilityLabel("navigator")
+        .onChange(of: enableSourceControl) { _ in
+            updateTabItems()
+        }
+    }
+
+    private func updateTabItems() {
+        viewModel.tabItems = [.project] +
+            (enableSourceControl ? [.sourceControl] : []) +
+            [.search] +
+            extensionManager
+                .extensions
+                .flatMap { ext in
+                    ext.availableFeatures.compactMap {
+                        if case .sidebarItem(let data) = $0, data.kind == .navigator {
+                            return NavigatorTab.uiExtension(endpoint: ext.endpoint, data: data)
+                        }
+                        return nil
+                    }
+                }
+        if let selectedTab = viewModel.selectedTab,
+            !viewModel.tabItems.isEmpty &&
+            !viewModel.tabItems.contains(selectedTab) {
+            viewModel.selectedTab = viewModel.tabItems[0]
+        }
     }
 }

CodeEdit/Features/Settings/Models/GlobPattern.swift

@@ -0,0 +1,16 @@
+//
+//  GlobPattern.swift
+//  CodeEdit
+//
+//  Created by Austin Condiff on 11/2/24.
+//
+
+import Foundation
+
+struct GlobPattern: Identifiable, Hashable, Decodable, Encodable {
+    /// Ephimeral UUID used to track its representation in the UI
+    var id = UUID()
+
+    /// The Glob Pattern to render
+    var value: String
+}

CodeEdit/Features/Settings/Pages/SearchSettings/Models/SearchSettingsModel.swift

@@ -7,14 +7,6 @@
 
 import SwiftUI
 
-struct GlobPattern: Identifiable, Hashable, Decodable, Encodable {
-    /// Ephimeral UUID used to track its representation in the UI
-    var id = UUID()
-
-    /// The Glob Pattern to render
-    var value: String
-}
-
 /// The Search Settings View Model. Accessible via the singleton "``SearchSettings/shared``".
 ///
 /// **Usage:**
@@ -55,6 +47,9 @@ final class SearchSettingsModel: ObservableObject {
         baseURL.appendingPathComponent("settings.json", isDirectory: true)
     }
 
+    /// Selected patterns
+    @Published var selection: Set<GlobPattern> = []
+
     /// Stores the new values from the Search Settings Model into the settings.json whenever
     /// `ignoreGlobPatterns` is updated
     @Published var ignoreGlobPatterns: [GlobPattern] {
@@ -64,4 +59,14 @@ final class SearchSettingsModel: ObservableObject {
             }
         }
     }
+
+    func addPattern() {
+        ignoreGlobPatterns.append(GlobPattern(value: ""))
+    }
+
+    func removePatterns(_ selection: Set<GlobPattern>? = nil) {
+        let patternsToRemove = selection ?? self.selection
+        ignoreGlobPatterns.removeAll { patternsToRemove.contains($0) }
+        self.selection.removeAll()
+    }
 }