Additional Git Features and Navigator UI Improvements (#1471)

* Added reusable SidebarTextField view. Started using it in the navigator by replacing some text fields. Added more functionality to Find navigator's UI.

* Added SearchTextField and started using it in the Navigator. Added functionality to Find Navigator UI.

* Refactored source control filter to use new sidebar text field view

* Refactored UI in source control navigator and find navigator. Using PaneTextField in navigators. Still a WIP. Crash occurs in changes tab of source control navigator because of duplicate keys of type 'CEWorkspaceFile'

* Staging and unstaging all changed files for commit now possible. We can now click a changed file to open it as a temporary tab in the editor, double-click to open as a normal tab.

* Checking and unchecking changed files now performs a git add/reset command. Checked state is synced with staged git status even when stage occurs externally.

* Detects if project is or is not a git repository. If it isn't the source control navigator displays a content unavailable state letting the user know it isn't and offering an option to do a git init.

* Added CEContentUnavailableView to replace all instances of zero state text we were each manually styling.

* Rearranged the source control navigator to be cleaner. Using sourcControlManager as an EnvironmentObject instead of passing it down the view hierarchy

* Displaying number of commits ahead and behind remote. Added ability to pull and fetch. Fetching on an interval when source control navigator is visible.

* Moved axis and lineLimit out of PaneTextView so it can be customized outside. Defaulting to horitontal axis.

* Fixed SwiftLint issue

* Fixed SwiftLint error

* Added missing slash to file change help

* Improved readability in EditorView

* Corrected comment

* Simplified git init button label

* Added ability to stash, pop, and list stash entries. Refactored repositories tab.

* Update CodeEdit/Features/Git/SourceControlManager.swift

Co-authored-by: Khan Winter <[email protected]>

* Checking to see if the current branch changed or if we checked out a different branch so we can update the UI to reflect. Revised the new branch view. Repositories tab now uses a new CEOutlineGroup view which allows for expand state control.

* Moved git related file changes into a separate function to fix SwiftLint error. Added the ability to delete branches, stashes, and remotes. Added ability to add an existing remote from the repositories tab.

* Replaced buttons with toggles in find navigator form

* Added the ability to rename a branch. Selected the first item by default in Settings sidebar navigation list.

* Resolved PR issues and fixed SwiftLint errors

* Made CEWorkspaceFile.url immutable and used it in the hash function along with the id

* Removed comment

* Added ability to apply stash entries. Cleaned up code

* Added the ability to apply and delete stash,

* SwiftLint error fix

* Revised how we were checking if the project is a git repository

* Addressed an issue in PR by elimiating extra initializer

* Preparing to recieve search changes from main.

* Updated symbols package so that branches symbol is compatible with Ventura.

* Using message details in git commit command

---------

Co-authored-by: Khan Winter <[email protected]>

Author: austincondiff

CodeEdit.xcodeproj/project.pbxproj

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "line.3.horizontal.decrease.chevron.filled.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "line.3.horizontal.decrease.chevron.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

CodeEdit/Assets.xcassets/line.3.horizontal.decrease.chevron.filled.imageset/Contents.json

@@ -45,7 +45,7 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
     var type: FileIcon.FileType { .init(rawValue: url.pathExtension) ?? .txt }
 
     /// Returns the URL of the ``CEWorkspaceFile``
-    var url: URL
+    let url: URL
 
     /// Return the icon of the file as `Image`
     var icon: Image { Image(systemName: systemImage) }
@@ -73,6 +73,9 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
     /// Returns the Git status of a file as ``GitType``
     var gitStatus: GitType?
 
+    /// Returns a boolean that is true if the file is staged for commit
+    var staged: Bool?
+
     /// Returns the `id` in ``EditorTabID`` enum form
     var tabID: EditorTabID { .codeEditor(id) }
 
@@ -128,27 +131,32 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
 
     init(
         url: URL,
-        changeType: GitType? = nil
+        changeType: GitType? = nil,
+        staged: Bool? = false
     ) {
         self.url = url
         self.gitStatus = changeType
+        self.staged = staged
     }
 
     enum CodingKeys: String, CodingKey {
         case url
         case changeType
+        case staged
     }
 
     required init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         url = try values.decode(URL.self, forKey: .url)
         gitStatus = try values.decode(GitType.self, forKey: .changeType)
+        staged = try values.decode(Bool.self, forKey: .staged)
     }
 
     func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(url, forKey: .url)
         try container.encode(gitStatus, forKey: .changeType)
+        try container.encode(staged, forKey: .staged)
     }
 
     /// Returns a string describing a SFSymbol for folders
@@ -234,7 +242,7 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
     // MARK: Hashable
 
     func hash(into hasher: inout Hasher) {
-        hasher.combine(fileIdentifier)
+        hasher.combine(url)
         hasher.combine(id)
     }
 

CodeEdit/Assets.xcassets/line.3.horizontal.decrease.chevron.filled.imageset/line.3.horizontal.decrease.chevron.filled.pdf

@@ -38,7 +38,7 @@ protocol CEWorkspaceFileManagerObserver: AnyObject {
 /// ``CEWorkspaceFileManagerObserver`` protocol. Use the ``CEWorkspaceFileManager/addObserver(_:)``
 /// and ``CEWorkspaceFileManager/removeObserver(_:)`` to add or remove observers. Observers are kept as weak references.
 final class CEWorkspaceFileManager {
-    private(set) var fileManager = FileManager.default
+    private(set) var fileManager: FileManager
     private(set) var ignoredFilesAndFolders: Set<String>
     private(set) var flattenedFileItems: [String: CEWorkspaceFile]
     /// Maps all directories to it's children's paths.
@@ -58,6 +58,7 @@ final class CEWorkspaceFileManager {
     init(
         folderUrl: URL,
         ignoredFilesAndFolders: Set<String>,
+        fileManager: FileManager = FileManager.default,
         sourceControlManager: SourceControlManager?
     ) {
         self.folderUrl = folderUrl
@@ -66,12 +67,17 @@ final class CEWorkspaceFileManager {
         self.workspaceItem = CEWorkspaceFile(url: folderUrl)
         self.flattenedFileItems = [workspaceItem.id: workspaceItem]
         self.sourceControlManager = sourceControlManager
+        self.fileManager = fileManager
 
         self.loadChildrenForFile(self.workspaceItem)
 
         fsEventStream = DirectoryEventStream(directory: self.folderUrl.path) { [weak self] events in
             self?.fileSystemEventReceived(events: events)
         }
+
+        Task {
+            try await self.sourceControlManager?.validate()
+        }
     }
 
     // MARK: - Public API
@@ -149,7 +155,7 @@ final class CEWorkspaceFileManager {
         }
         childrenMap[file.id] = children.map { $0.relativePath }
         Task {
-            await sourceControlManager?.refresAllChangesFiles()
+            await sourceControlManager?.refreshAllChangedFiles()
         }
     }
 
@@ -220,12 +226,83 @@ final class CEWorkspaceFileManager {
                 self.notifyObservers(updatedItems: files)
             }
 
-            // Ignore changes to .git folder
-            let notGitChanges = events.filter({ !$0.path.contains(".git/") })
-            if !notGitChanges.isEmpty {
-                Task {
-                    await self.sourceControlManager?.refresAllChangesFiles()
-                }
+            self.handleGitEvents(events: events)
+        }
+    }
+
+    func handleGitEvents(events: [DirectoryEventStream.Event]) {
+        // Changes excluding .git folder
+        let notGitChanges = events.filter({ !$0.path.contains(".git/") })
+
+        // .git folder was changed
+        let gitFolderChange = events.first(where: {
+            $0.path == "\(self.folderUrl.relativePath)/.git"
+        })
+
+        // Change made to git index file, staged/unstaged files
+        let gitIndexChange = events.first(where: {
+            $0.path == "\(self.folderUrl.relativePath)/.git/index"
+        })
+
+        // Change made to git stash
+        let gitStashChange = events.first(where: {
+            $0.path == "\(self.folderUrl.relativePath)/.git/refs/stash"
+        })
+
+        // Changes made to git branches
+        let gitBranchChange = events.first(where: {
+            $0.path.contains("\(self.folderUrl.relativePath)/.git/refs/heads")
+        })
+
+        // Changes made to git HEAD - current branch changed
+        let gitHeadChange = events.first(where: {
+            $0.path.contains("\(self.folderUrl.relativePath)/.git/HEAD")
+        })
+
+        // Change made to remotes by looking at .git/config
+        let gitConfigChange = events.first(where: {
+            $0.path == "\(self.folderUrl.relativePath)/.git/config"
+        })
+
+        // If changes were made to project OR files were staged, refresh changes
+        if !notGitChanges.isEmpty || gitIndexChange != nil {
+            Task {
+                await self.sourceControlManager?.refreshAllChangedFiles()
+            }
+        }
+
+        // If changes were stashed, refresh stashed entries
+        if gitStashChange != nil {
+            Task {
+                try await self.sourceControlManager?.refreshStashEntries()
+            }
+        }
+
+        // If branches were added or removed, refresh branches
+        if gitBranchChange != nil {
+            Task {
+                await self.sourceControlManager?.refreshBranches()
+            }
+        }
+
+        // If HEAD was changed, refresh the current branch
+        if gitHeadChange != nil {
+            Task {
+                await self.sourceControlManager?.refreshCurrentBranch()
+            }
+        }
+
+        // If git config changed, refresh remotes
+        if gitConfigChange != nil {
+            Task {
+                try await self.sourceControlManager?.refreshRemotes()
+            }
+        }
+
+        // If .git folder was added or removed, check if repository is valid
+        if gitFolderChange != nil {
+            Task {
+                try await self.sourceControlManager?.validate()
             }
         }
     }

CodeEdit/Assets.xcassets/line.3.horizontal.decrease.chevron.imageset/Contents.json

@@ -104,14 +104,17 @@ struct AreaTabBar<Tab: AreaTab>: View {
             getSafeImage(named: tab.systemImage, accessibilityDescription: tab.title)
                 .font(.system(size: 12.5))
                 .symbolVariant(tab == selection ? .fill : .none)
-                .frame(
-                    width: position == .side ? 40 : 24,
-                    height: position == .side ? 28 : size.height,
-                    alignment: .center
-                )
                 .help(tab.title)
         }
-        .buttonStyle(.icon(isActive: tab == selection, size: nil))
+        .buttonStyle(
+            .icon(
+                isActive: tab == selection,
+                size: CGSize(
+                    width: position == .side ? 40 : 24,
+                    height: position == .side ? 28 : size.height
+                )
+            )
+        )
     }
 
     private func makeAreaTabDragGesture(tab: Tab) -> some Gesture {

CodeEdit/Assets.xcassets/line.3.horizontal.decrease.chevron.imageset/line.3.horizontal.decrease.chevron.pdf

@@ -0,0 +1,62 @@
+//
+//  CEContentUnavailableView.swift
+//  CodeEdit
+//
+//  Created by Austin Condiff on 11/17/23.
+//
+
+import SwiftUI
+
+struct CEContentUnavailableView<Actions: View>: View {
+    var label: String
+    var description: String?
+    var systemImage: String?
+    var actions: Actions?
+
+    init(
+        _ label: String,
+        description: String? = nil,
+        systemImage: String? = nil,
+        @ViewBuilder actions: () -> Actions? = { EmptyView() }
+    ) {
+        self.label = label
+        self.description = description
+        self.systemImage = systemImage
+        self.actions = actions()
+    }
+
+    var contentUnavaiableView: some View {
+        VStack(spacing: 14) {
+            VStack(spacing: 5) {
+                if systemImage != nil {
+                    Image(systemName: systemImage ?? "questionmark.app.dashed")
+                        .font(.system(size: 28))
+                        .foregroundStyle(.tertiary)
+                        .padding(.bottom, 8)
+                }
+                Text(label)
+                    .font(.system(size: 16.5, weight: systemImage != nil ? .bold : .regular))
+                if description != nil {
+                    Text(description ?? "")
+                        .font(.system(size: 10))
+                }
+            }
+            if let actionsView = actions {
+                HStack { actionsView }
+            }
+        }
+        .foregroundColor(.secondary)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .contentShape(Rectangle())
+        .controlSize(.small)
+    }
+
+    var body: some View {
+        if #available(macOS 14, *) {
+            contentUnavaiableView
+                .buttonStyle(.accessoryBarAction)
+        } else {
+            contentUnavaiableView
+        }
+    }
+}