Update SourceControlManager.swift

Co-authored-by: Tom Ludwig <[email protected]>
CodeEditApp · Mar 25, 2024 · 6c5c539 · 6c5c539
1 parent b74e49a
commit 6c5c539
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/CodeEdit/Features/Git/SourceControlManager.swift b/CodeEdit/Features/Git/SourceControlManager.swift
@@ -38,17 +38,13 @@ final class SourceControlManager: ObservableObject {
 
     @Published var isGitRepository: Bool = false
 
-    var orderedLocalBranches: [GitBranch] {
-        var orderedBranches: [GitBranch] = []
-        if let currentBranch {
-            orderedBranches.append(currentBranch)
-        }
-        let othersBranch = branches
-            .filter { $0.isLocal && $0.name != currentBranch?.name }
-            .sorted { $0.name < $1.name }
-        orderedBranches.append(contentsOf: othersBranch)
-        return orderedBranches
-    }
+  var orderedLocalBranches: [GitBranch] {
+    var orderedBranches: [GitBranch] = [currentBranch].compactMap { $0 }
+    let otherBranches = branches.filter { $0.isLocal && $0 != currentBranch }
+                               .sorted { $0.name < $1.name }
+    orderedBranches.append(contentsOf: otherBranches)
+    return orderedBranches
+}
 
     init(
         workspaceURL: URL,