Git branches list order and truncate priority issue (#1647)

* fix: branches list order issue and truncate priority of name

* Update SourceControlManager.swift

Co-authored-by: Tom Ludwig <tommludwig@icloud.com>

* fix: optimize branch picker list issue and use lowercase to sort

---------

Co-authored-by: Tom Ludwig <tommludwig@icloud.com>

Author: phlpsong

CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

@@ -112,15 +112,15 @@ struct ToolbarBranchPicker: View {
                     }
                 }
 
-                let branches = sourceControlManager.branches
-                    .filter({ $0.isLocal && $0 != sourceControlManager.currentBranch })
+                let branches = sourceControlManager.orderedLocalBranches
+                    .filter({ $0 != sourceControlManager.currentBranch })
                 let branchesGroups = branches.reduce(into: [String: GitBranchesGroup]()) { result, branch in
                     guard let branchPrefix = branch.name.components(separatedBy: "/").first else {
                         return
                     }
 
                     result[
-                        branchPrefix,
+                        branchPrefix.lowercased(),
                         default: GitBranchesGroup(name: branchPrefix, branches: [])
                     ].branches.append(branch)
                 }

CodeEdit/Features/Git/SourceControlManager.swift

@@ -38,6 +38,14 @@ final class SourceControlManager: ObservableObject {
 
     @Published var isGitRepository: Bool = false
 
+    var orderedLocalBranches: [GitBranch] {
+        var orderedBranches: [GitBranch] = [currentBranch].compactMap { $0 }
+        let otherBranches = branches.filter { $0.isLocal && $0 != currentBranch }
+            .sorted { $0.name.lowercased() < $1.name.lowercased() }
+        orderedBranches.append(contentsOf: otherBranches)
+        return orderedBranches
+    }
+
     init(
         workspaceURL: URL,
         editorManager: EditorManager

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryItem.swift

@@ -24,6 +24,7 @@ struct SourceControlNavigatorRepositoryItem: View {
                         .lineLimit(1)
                         .foregroundStyle(.secondary)
                         .font(.system(size: 11))
+                        .layoutPriority(-1)
                 }
                 Spacer()
                 HStack(spacing: 5) {

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView+outlineGroupData.swift

@@ -15,7 +15,7 @@ extension SourceControlNavigatorRepositoryView {
                 label: "Branches",
                 systemImage: "externaldrive.fill",
                 imageColor: Color(nsColor: .secondaryLabelColor),
-                children: sourceControlManager.branches.filter({ $0.isLocal }).map { branch in
+                children: sourceControlManager.orderedLocalBranches.map { branch in
                         .init(
                             id: "Branch\(branch.name)",
                             label: branch.name,