Ignored files can be changed while preserving comments and white space in the users .gitignore_global file. Users can now reorder ignored files. Buttons were added in settings to open .gitconfig and .gitignore_global in an editor.

austincondiff · austincondiff · commit 71ee6c66723c · 2024-11-25T16:47:30.000-06:00
diff --git a/CodeEdit/Features/Settings/Pages/SearchSettings/Models/SearchSettingsModel.swift b/CodeEdit/Features/Settings/Pages/SearchSettings/Models/SearchSettingsModel.swift
@@ -48,7 +48,7 @@ final class SearchSettingsModel: ObservableObject {
     }
 
     /// Selected patterns
-    @Published var selection: Set<GlobPattern> = []
+    @Published var selection: Set<UUID> = []
 
     /// Stores the new values from the Search Settings Model into the settings.json whenever
     /// `ignoreGlobPatterns` is updated
@@ -60,12 +60,16 @@ final class SearchSettingsModel: ObservableObject {
         }
     }
 
+    func getPattern(for id: UUID) -> GlobPattern? {
+        return ignoreGlobPatterns.first(where: { $0.id == id })
+    }
+
     func addPattern() {
         ignoreGlobPatterns.append(GlobPattern(value: ""))
     }
 
-    func removePatterns(_ selection: Set<GlobPattern>? = nil) {
-        let patternsToRemove = selection ?? self.selection
+    func removePatterns(_ selection: Set<UUID>? = nil) {
+        let patternsToRemove = selection?.compactMap { getPattern(for: $0) } ?? []
         ignoreGlobPatterns.removeAll { patternsToRemove.contains($0) }
         self.selection.removeAll()
     }
diff --git a/CodeEdit/Features/Settings/Pages/SourceControlSettings/IgnoredFilesListView.swift b/CodeEdit/Features/Settings/Pages/SourceControlSettings/IgnoredFilesListView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct IgnoredFilesListView: View {
-    @ObservedObject private var model = IgnorePatternModel()
+    @StateObject private var model = IgnorePatternModel()
 
     var body: some View {
         GlobPatternList(
diff --git a/CodeEdit/Features/Settings/Pages/SourceControlSettings/Models/IgnorePatternModel.swift b/CodeEdit/Features/Settings/Pages/SourceControlSettings/Models/IgnorePatternModel.swift
@@ -8,18 +8,64 @@
 import Foundation
 
 class IgnorePatternModel: ObservableObject {
-    @Published var patterns: [GlobPattern] = []
-    @Published var selection: Set<GlobPattern> = []
-
-    let gitConfig = GitConfigClient(shellClient: currentWorld.shellClient)
+    @Published var loadingPatterns: Bool = false
+    @Published var patterns: [GlobPattern] = [] {
+        didSet {
+            if !loadingPatterns {
+                savePatterns()
+            } else {
+                loadingPatterns = false
+            }
+        }
+    }
+    @Published var selection: Set<UUID> = []
 
-    let fileURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".gitignore_global")
+    private let gitConfig = GitConfigClient(shellClient: currentWorld.shellClient)
+    private let fileURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".gitignore_global")
+    private var fileMonitor: DispatchSourceFileSystemObject?
 
     init() {
         loadPatterns()
+        startFileMonitor()
+    }
+
+    deinit {
+        stopFileMonitor()
+    }
+
+    private func startFileMonitor() {
+        let fileDescriptor = open(fileURL.path, O_EVTONLY)
+        guard fileDescriptor != -1 else {
+            return
+        }
+
+        let source = DispatchSource.makeFileSystemObjectSource(
+            fileDescriptor: fileDescriptor,
+            eventMask: .write,
+            queue: DispatchQueue.main
+        )
+
+        source.setEventHandler { [weak self] in
+            self?.loadPatterns()
+        }
+
+        source.setCancelHandler {
+            close(fileDescriptor)
+        }
+
+        fileMonitor?.cancel() // Cancel any existing monitor
+        fileMonitor = source
+        source.resume()
+    }
+
+    private func stopFileMonitor() {
+        fileMonitor?.cancel()
+        fileMonitor = nil
     }
 
     func loadPatterns() {
+        loadingPatterns = true
+
         guard FileManager.default.fileExists(atPath: fileURL.path) else {
             patterns = []
             return
@@ -33,11 +79,139 @@ class IgnorePatternModel: ObservableObject {
         }
     }
 
+    // Map to track the line numbers of patterns.
+    var patternLineMapping: [String: Int] = [:]
+
+    func getPattern(for id: UUID) -> GlobPattern? {
+        return patterns.first(where: { $0.id == id })
+    }
+
     func savePatterns() {
+        // Suspend the file monitor to avoid self-triggered updates
+        stopFileMonitor()
+
+        defer {
+            startFileMonitor()
+        }
+
+        // Get the file contents; if the file doesn't exist, create it with the patterns
+        guard let fileContent = try? String(contentsOf: fileURL) else {
+            writeAllPatterns()
+            return
+        }
+
+        let lines = fileContent.split(separator: "\n", omittingEmptySubsequences: false).map(String.init)
+        var patternToLineIndex: [String: Int] = [:] // Map patterns to their line indices
+        var reorderedLines: [String] = [] // Store the final reordered lines
+
+        // Map existing patterns in the file
+        for (index, line) in lines.enumerated() {
+            let trimmedLine = line.trimmingCharacters(in: .whitespaces)
+            if !trimmedLine.isEmpty && !trimmedLine.hasPrefix("#") {
+                patternToLineIndex[trimmedLine] = index
+            }
+        }
+
+        // Add patterns in the new order specified by the `patterns` array
+        for pattern in patterns {
+            let value = pattern.value
+            if let index = patternToLineIndex[value] {
+                // Keep the original line if it matches a pattern
+                reorderedLines.append(lines[index])
+                patternToLineIndex.removeValue(forKey: value)
+            } else {
+                // Add new patterns that don't exist in the file
+                reorderedLines.append(value)
+            }
+        }
+
+        // Add remaining non-pattern lines (comments, whitespace)
+        for (index, line) in lines.enumerated() {
+            let trimmedLine = line.trimmingCharacters(in: .whitespaces)
+            if trimmedLine.isEmpty || trimmedLine.hasPrefix("#") {
+                reorderedLines.insert(line, at: index)
+            }
+        }
+
+        // Ensure single blank line at the end
+        reorderedLines = cleanUpWhitespace(in: reorderedLines)
+
+        // Write the updated content back to the file
+        let updatedContent = reorderedLines.joined(separator: "\n")
+        try? updatedContent.write(to: fileURL, atomically: true, encoding: .utf8)
+    }
+
+    private func writeAllPatterns() {
         let content = patterns.map(\.value).joined(separator: "\n")
         try? content.write(to: fileURL, atomically: true, encoding: .utf8)
     }
 
+    private func handlePatterns(
+        _ lines: inout [String],
+        existingPatterns: inout Set<String>,
+        patternLineMap: inout [String: Int]
+    ) {
+        var handledPatterns = Set<String>()
+
+        // Update or preserve existing patterns
+        for pattern in patterns {
+            let value = pattern.value
+            if let lineIndex = patternLineMap[value] {
+                // Pattern already exists, update it in place
+                lines[lineIndex] = value
+                handledPatterns.insert(value)
+            } else {
+                // Check if the pattern has been edited and corresponds to a previous pattern
+                if let oldPattern = existingPatterns.first(where: { !handledPatterns.contains($0) && $0 != value }),
+                   let lineIndex = patternLineMap[oldPattern] {
+                    lines[lineIndex] = value
+                    existingPatterns.remove(oldPattern)
+                    patternLineMap[value] = lineIndex
+                    handledPatterns.insert(value)
+                } else {
+                    // Append new patterns at the end
+                    if let lastLine = lines.last, lastLine.trimmingCharacters(in: .whitespaces).isEmpty {
+                        lines.removeLast() // Remove trailing blank line before appending
+                    }
+                    lines.append(value)
+                }
+            }
+        }
+
+        // Remove patterns no longer in the list
+        let currentPatterns = Set(patterns.map(\.value))
+        lines = lines.filter { line in
+            let trimmedLine = line.trimmingCharacters(in: .whitespaces)
+            return trimmedLine.isEmpty || trimmedLine.hasPrefix("#") || currentPatterns.contains(trimmedLine)
+        }
+    }
+
+    private func cleanUpWhitespace(in lines: [String]) -> [String] {
+        var cleanedLines: [String] = []
+        var previousLineWasBlank = false
+
+        for line in lines {
+            let isBlank = line.trimmingCharacters(in: .whitespaces).isEmpty
+            if !(isBlank && previousLineWasBlank) {
+                cleanedLines.append(line)
+            }
+            previousLineWasBlank = isBlank
+        }
+
+        // Trim extra blank lines at the end, ensuring only a single blank line
+        while let lastLine = cleanedLines.last, lastLine.trimmingCharacters(in: .whitespaces).isEmpty {
+            cleanedLines.removeLast()
+        }
+        cleanedLines.append("") // Ensure exactly one blank line at the end
+
+        // Trim whitespace at the top of the file
+        while let firstLine = cleanedLines.first, firstLine.trimmingCharacters(in: .whitespaces).isEmpty {
+            cleanedLines.removeFirst()
+        }
+
+        return cleanedLines
+    }
+
     @MainActor
     func addPattern() {
         if patterns.isEmpty {
@@ -46,16 +220,12 @@ class IgnorePatternModel: ObservableObject {
             }
         }
         patterns.append(GlobPattern(value: ""))
-        Task {
-            savePatterns()
-        }
     }
 
     @MainActor
-    func removePatterns(_ selection: Set<GlobPattern>? = nil) {
-        let patternsToRemove = selection ?? self.selection
+    func removePatterns(_ selection: Set<UUID>? = nil) {
+        let patternsToRemove = selection?.compactMap { getPattern(for: $0) } ?? []
         patterns.removeAll { patternsToRemove.contains($0) }
-        savePatterns()
         self.selection.removeAll()
     }
 
diff --git a/CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift b/CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift
@@ -38,7 +38,7 @@ struct SourceControlGeneralView: View {
         .onAppear {
             Task {
                 defaultBranch = try await gitConfig.get(key: "init.defaultBranch", global: true) ?? ""
-                Task {
+                DispatchQueue.main.async {
                     hasAppeared = true
                 }
             }
diff --git a/CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift b/CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift
@@ -27,21 +27,24 @@ struct SourceControlGitView: View {
             Section {
                 preferToRebaseWhenPulling
                 showMergeCommitsInPerFileLog
+            } footer: {
+                Button("Open in Editor...", action: openGitConfigFile)
             }
             Section {
                 IgnoredFilesListView()
             } header: {
                 Text("Ignored Files")
+            } footer: {
+                Button("Open in Editor...", action: openGitIgnoreFile)
             }
         }
         .onAppear {
             Task {
                 authorName = try await gitConfig.get(key: "user.name", global: true) ?? ""
                 authorEmail = try await gitConfig.get(key: "user.email", global: true) ?? ""
                 preferRebaseWhenPulling = try await gitConfig.get(key: "pull.rebase", global: true) ?? false
-                Task {
-                    hasAppeared = true
-                }
+                try? await Task.sleep(for: .milliseconds(0))
+                hasAppeared = true
             }
         }
     }
@@ -113,4 +116,43 @@ private extension SourceControlGitView {
             Spacer()
         }
     }
+
+    private func openGitConfigFile() {
+        let fileURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".gitconfig")
+
+        if !FileManager.default.fileExists(atPath: fileURL.path) {
+            FileManager.default.createFile(atPath: fileURL.path, contents: nil)
+        }
+
+        NSDocumentController.shared.openDocument(
+            withContentsOf: fileURL,
+            display: true
+        ) { _, _, error in
+            if let error = error {
+                print("Failed to open document: \(error.localizedDescription)")
+            }
+        }
+    }
+
+    private func openGitIgnoreFile() {
+        let fileURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".gitignore_global")
+
+        if !FileManager.default.fileExists(atPath: fileURL.path) {
+            FileManager.default.createFile(atPath: fileURL.path, contents: nil)
+            guard !FileManager.default.fileExists(atPath: fileURL.path) else { return }
+            FileManager.default.createFile(atPath: fileURL.path, contents: nil)
+            Task {
+                await gitConfig.set(key: "core.excludesfile", value: fileURL.path, global: true)
+            }
+        }
+
+        NSDocumentController.shared.openDocument(
+            withContentsOf: fileURL,
+            display: true
+        ) { _, _, error in
+            if let error = error {
+                print("Failed to open document: \(error.localizedDescription)")
+            }
+        }
+    }
 }
diff --git a/CodeEdit/Features/Settings/Views/GlobPatternList.swift b/CodeEdit/Features/Settings/Views/GlobPatternList.swift
diff --git a/CodeEdit/Features/Settings/Views/GlobPatternListItem.swift b/CodeEdit/Features/Settings/Views/GlobPatternListItem.swift

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ final class SearchSettingsModel: ObservableObject {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// Selected patterns`
`51`		`- @Published var selection: Set<GlobPattern> = []`
	`51`	`+ @Published var selection: Set<UUID> = []`
`52`	`52`
`53`	`53`	`/// Stores the new values from the Search Settings Model into the settings.json whenever`
`54`	`54`	/// `ignoreGlobPatterns` is updated
`@@ -60,12 +60,16 @@ final class SearchSettingsModel: ObservableObject {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ func getPattern(for id: UUID) -> GlobPattern? {`
	`64`	`+ return ignoreGlobPatterns.first(where: { $0.id == id })`
	`65`	`+ }`
	`66`	`+`
`63`	`67`	`func addPattern() {`
`64`	`68`	`ignoreGlobPatterns.append(GlobPattern(value: ""))`
`65`	`69`	`}`
`66`	`70`
`67`		`- func removePatterns(_ selection: Set<GlobPattern>? = nil) {`
`68`		`- let patternsToRemove = selection ?? self.selection`
	`71`	`+ func removePatterns(_ selection: Set<UUID>? = nil) {`
	`72`	`+ let patternsToRemove = selection?.compactMap { getPattern(for: $0) } ?? []`
`69`	`73`	`ignoreGlobPatterns.removeAll { patternsToRemove.contains($0) }`
`70`	`74`	`self.selection.removeAll()`
`71`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ struct SourceControlGeneralView: View {`
`38`	`38`	`.onAppear {`
`39`	`39`	`Task {`
`40`	`40`	`defaultBranch = try await gitConfig.get(key: "init.defaultBranch", global: true) ?? ""`
`41`		`- Task {`
	`41`	`+ DispatchQueue.main.async {`
`42`	`42`	`hasAppeared = true`
`43`	`43`	`}`
`44`	`44`	`}`