Add branch completion on "Contains" condition

PhysShell · PhysShell · commit 55afeb444892 · 2026-03-04T15:07:30.000+05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,19 @@ All notable changes to this project are documented in this file.
 
 The format is based on Keep a Changelog and the project uses Semantic Versioning.
 
+## [0.1.5] - 2026-03-04
+
+### Changed
+
+- Branch completion now supports both match strategies:
+  - priority 1: branch names that start with the typed fragment (`StartsWith`);
+  - priority 2: branch names that contain the typed fragment anywhere (`Contains`).
+- `gsw` and other branch-oriented alias completions now use the same prioritized branch selection, including native-completion delegation paths.
+
+### Added
+
+- Integration test coverage for branch completion ordering to verify that `StartsWith` results are listed before `Contains` results.
+
 ## [0.1.4] - 2026-02-20
 
 ### Fixed
diff --git a/git-aliases-extra.psd1 b/git-aliases-extra.psd1
@@ -1,6 +1,6 @@
 @{
     RootModule = 'git-aliases-extra.psm1'
-    ModuleVersion = '0.1.4'
+    ModuleVersion = '0.1.5'
     GUID = 'a5c2859e-7dce-4853-9db5-8cb7927dbdda'
     Author = 'PhysShell'
     CompanyName = ''
diff --git a/git-aliases-extra.psm1 b/git-aliases-extra.psm1
@@ -70,6 +70,76 @@ function Convert-ToPowerShellBranchCompletionText {
     return $BranchName
 }
 
+function Get-GitBranchCompletionPrefix {
+    param(
+        [AllowEmptyString()]
+        [string]$WordToComplete
+    )
+
+    $prefix = $WordToComplete.Trim("'", '"')
+    if ($prefix.StartsWith('`')) {
+        $prefix = $prefix.Substring(1)
+    }
+
+    return $prefix
+}
+
+function Get-GitBranchNames {
+    if (-not (Test-InGitRepo)) {
+        return @()
+    }
+
+    try {
+        return @(
+            git branch -a --format='%(refname:short)' |
+            ForEach-Object { $_.Trim() } |
+            Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
+            ForEach-Object { $_ -replace '^remotes/origin/', '' } |
+            Where-Object { $_ -ne 'HEAD' } |
+            Sort-Object -Unique
+        )
+    } catch {
+        return @()
+    }
+}
+
+function Select-GitBranchesForCompletion {
+    param(
+        [AllowEmptyCollection()]
+        [string[]]$Branches,
+        [AllowEmptyString()]
+        [string]$Prefix
+    )
+
+    if (-not $Branches -or $Branches.Count -eq 0) {
+        return @()
+    }
+
+    if ([string]::IsNullOrWhiteSpace($Prefix)) {
+        return @($Branches)
+    }
+
+    $startsWithMatches = @()
+    $containsMatches = @()
+    foreach ($entry in $Branches) {
+        $branchName = [string]$entry
+        if ([string]::IsNullOrWhiteSpace($branchName)) {
+            continue
+        }
+
+        if ($branchName.StartsWith($Prefix, [System.StringComparison]::OrdinalIgnoreCase)) {
+            $startsWithMatches += $branchName
+            continue
+        }
+
+        if ($branchName.IndexOf($Prefix, [System.StringComparison]::OrdinalIgnoreCase) -ge 0) {
+            $containsMatches += $branchName
+        }
+    }
+
+    return @($startsWithMatches + $containsMatches)
+}
+
 function Get-GitLongOptionCompletions {
     param(
         [Parameter(Mandatory = $true)]
@@ -272,28 +342,11 @@ function Get-GitBranchCompletions {
         [string]$WordToComplete
     )
 
-    if (-not (Test-InGitRepo)) {
-        return @()
-    }
-
-    $prefix = $WordToComplete.Trim("'", '"')
-    if ($prefix.StartsWith('`')) {
-        $prefix = $prefix.Substring(1)
-    }
-
     try {
-        $branches = @(
-            git branch -a --format='%(refname:short)' |
-            ForEach-Object { $_.Trim() } |
-            Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
-            ForEach-Object { $_ -replace '^remotes/origin/', '' } |
-            Where-Object { $_ -ne 'HEAD' } |
-            Sort-Object -Unique
-        )
-
-        if (-not [string]::IsNullOrWhiteSpace($prefix)) {
-            $branches = @($branches | Where-Object { $_ -like "$prefix*" })
-        }
+        $prefix = Get-GitBranchCompletionPrefix -WordToComplete $WordToComplete
+        $branches = Select-GitBranchesForCompletion `
+            -Branches (Get-GitBranchNames) `
+            -Prefix $prefix
 
         if (-not $branches -or $branches.Count -eq 0) {
             return @()
@@ -1091,6 +1144,14 @@ function Register-GitAliasCompletion {
                     }
                 }
 
+                if ($primarySubCommand -in @('checkout', 'switch', 'merge', 'rebase', 'branch', 'reset', 'revert') -and
+                    $wordToComplete -notlike '-*') {
+                    $branchCompletions = Get-GitBranchCompletions -WordToComplete $wordToComplete
+                    if ($branchCompletions -and $branchCompletions.Count -gt 0) {
+                        return $branchCompletions
+                    }
+                }
+
                 if ($wordToComplete -like '-*') {
                     $optionCompletions = Get-GitLongOptionCompletions -SubCommandLine $subCommandLine -WordToComplete $wordToComplete
                     if ($optionCompletions -and $optionCompletions.Count -gt 0) {
@@ -1134,16 +1195,9 @@ function Register-GitAliasCompletion {
         # Final fallback when delegated completion is unavailable
         if ($primarySubCommand -in @('checkout', 'switch', 'merge', 'rebase', 'branch', 'reset', 'revert')) {
             try {
-                $branches = git branch -a --format='%(refname:short)' |
-                            ForEach-Object { $_ -replace '^remotes/origin/', '' } |
-                            Sort-Object -Unique |
-                            Where-Object { $_ -like "$wordToComplete*" }
-                if ($branches) {
-                    return $branches | ForEach-Object {
-                        $branchName = $_
-                        $safeText = Convert-ToPowerShellBranchCompletionText -BranchName $branchName
-                        [System.Management.Automation.CompletionResult]::new($safeText, $branchName, 'ParameterValue', $branchName)
-                    }
+                $branchCompletions = Get-GitBranchCompletions -WordToComplete $wordToComplete
+                if ($branchCompletions -and $branchCompletions.Count -gt 0) {
+                    return $branchCompletions
                 }
             } catch {
                 return @()
diff --git a/tests/git-aliases-extra.Integration.Tests.ps1 b/tests/git-aliases-extra.Integration.Tests.ps1
@@ -341,6 +341,58 @@ Describe 'gsw integration' {
         $completionTexts | Should -Contain '--track'
     }
 
+    It 'prioritizes starts-with matches before contains matches for gsw branch completion' -Skip:(-not (Get-Command git -ErrorAction SilentlyContinue)) {
+        $tempRoot = Join-Path ([IO.Path]::GetTempPath()) ("gsw-contains-complete-" + [guid]::NewGuid().Guid)
+        $repoPath = Join-Path $tempRoot 'repo'
+
+        New-Item -ItemType Directory -Path $repoPath -Force | Out-Null
+        try {
+            Invoke-GitCommand -RepoPath $tempRoot -Arguments @('init', $repoPath) | Out-Null
+            Invoke-GitCommand -RepoPath $repoPath -Arguments @('config', 'user.email', 'test@example.com') | Out-Null
+            Invoke-GitCommand -RepoPath $repoPath -Arguments @('config', 'user.name', 'Test User') | Out-Null
+            Invoke-GitCommand -RepoPath $repoPath -Arguments @('config', 'commit.gpgsign', 'false') | Out-Null
+
+            Set-Content -Path (Join-Path $repoPath 'README.md') -Value 'root' -NoNewline -Encoding ascii
+            Invoke-GitCommand -RepoPath $repoPath -Arguments @('add', 'README.md') | Out-Null
+            Invoke-GitCommand -RepoPath $repoPath -Arguments @('commit', '-m', 'init') | Out-Null
+            Invoke-GitCommand -RepoPath $repoPath -Arguments @('branch', '-M', 'main') | Out-Null
+
+            $startsWithBranches = @('br-alpha', 'br-zulu')
+            $containsBranches = @('feature/br-mid', 'release-abr')
+            foreach ($branchName in @($startsWithBranches + $containsBranches)) {
+                Invoke-GitCommand -RepoPath $repoPath -Arguments @('branch', $branchName) | Out-Null
+            }
+
+            Push-Location $repoPath
+            try {
+                $line = 'gsw br'
+                $result = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            } finally {
+                Pop-Location
+            }
+
+            $result.CompletionMatches.Count | Should -BeGreaterThan 0
+            $completionTexts = @($result.CompletionMatches | Select-Object -ExpandProperty CompletionText)
+
+            foreach ($branchName in $startsWithBranches) {
+                $completionTexts | Should -Contain $branchName
+            }
+            foreach ($branchName in $containsBranches) {
+                $completionTexts | Should -Contain $branchName
+            }
+
+            $startsWithIndexes = @($startsWithBranches | ForEach-Object { [array]::IndexOf($completionTexts, $_) })
+            $containsIndexes = @($containsBranches | ForEach-Object { [array]::IndexOf($completionTexts, $_) })
+
+            (($startsWithIndexes | Measure-Object -Maximum).Maximum) |
+                Should -BeLessThan (($containsIndexes | Measure-Object -Minimum).Minimum)
+        } finally {
+            if (Test-Path $tempRoot) {
+                Remove-Item -Path $tempRoot -Recurse -Force -ErrorAction SilentlyContinue
+            }
+        }
+    }
+
     It 'completes long options for gco alias from git-aliases module' -Skip:(-not (Get-Command git -ErrorAction SilentlyContinue) -or -not $script:HasGcoAlias) {
         Push-Location $script:RepoRoot
         try {
