feat🚸 (Invoke-GitCheckout): sort the branch options when invoke Invok…

…e-GitCheckout
capdiem · Jul 18, 2022 · 80d0b78 · 80d0b78
1 parent 1ed7b37
commit 80d0b78
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/PSGitUtils/PSGitUtils.psd1 b/PSGitUtils/PSGitUtils.psd1
@@ -12,7 +12,7 @@
   RootModule        = 'PSGitUtils.psm1'
 
   # Version number of this module.
-  ModuleVersion     = '1.12.2'
+  ModuleVersion     = '1.13.0'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()

diff --git a/PSGitUtils/PSGitUtils.psm1 b/PSGitUtils/PSGitUtils.psm1
@@ -260,6 +260,8 @@ function Get-OptionsForChoosingLocalOrOriginBranch {
   [string[]]$branches = $localBranches + $originBranches | Select-Object -Unique
   [char[]]$existChars = @('q')
 
+  $charBranchDict = @() # char:branch key:value
+
   for ($i = 0; $i -lt $branches.Count; $i++) {
     $branch = $branches[$i]
 
@@ -286,11 +288,16 @@ function Get-OptionsForChoosingLocalOrOriginBranch {
 
     if ($branchCharIndex -ne -1) {
       $branch = $branch.Insert(($branchCharIndex + $typeLength), '&')
+      Write-Host $existChars
+      $charBranchDict += @{k = $existChars[-1]; v = $branch }
+    } else {
+      $branchOptions += $branch
     }
-
-    $branchOptions += $branch
   }
 
+  # sort the branch options
+  $branchOptions = ($charBranchDict | Sort-Object -Property k | Select-Object -Property v).v + $branchOptions
+
   $branchOptions += "&quit"
 
   $choice = $host.UI.PromptForChoice($title, $message, $branchOptions, $branchOptions.Count - 1)