Fix issue with tab expansion of duplicate aliases.

Add Pester test for bug. Fix #421.
dahlbyk · Feb 16, 2017 · c7feff3 · c7feff3
1 parent 046876e
commit c7feff3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 7 deletions.
diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -192,7 +192,8 @@ function script:gitAliases($filter) {
 }
 
 function script:expandGitAlias($cmd, $rest) {
-    if ((git config --get-regexp "^alias\.$cmd`$") -match "^alias\.$cmd (?<cmd>[^!].*)`$") {
+    $gitAliases = @(git config --get-regexp "^alias\.$cmd`$")
+    if ($gitAliases[0] -match "^alias\.$cmd (?<cmd>[^!].*)`$") {
         return "git $($Matches['cmd'])$rest"
     }
     else {

diff --git a/test/Shared.ps1 b/test/Shared.ps1
@@ -23,12 +23,19 @@ function MakeGitPath([string]$Path) {
     $Path -replace '\\', '/'
 }
 
-function NewGitTempRepo {
+function NewGitTempRepo([switch]$MakeInitialCommit) {
     Push-Location
     $temp = [System.IO.Path]::GetTempPath()
     $repoPath = Join-Path $temp ([IO.Path]::GetRandomFileName())
     git.exe init $repoPath *>$null
     Set-Location $repoPath
+
+    if ($MakeInitialCommit) {
+        'readme' | Out-File .\README.md -Encoding ascii
+        git.exe add .\README.md *>$null
+        git.exe commit -m "initial commit." *>$null
+    }
+
     $repoPath
 }
 

diff --git a/test/TabExpansion.Tests.ps1 b/test/TabExpansion.Tests.ps1
@@ -142,14 +142,40 @@ Describe 'TabExpansion Tests' {
         }
     }
 
-    Context 'PowerShell Special Chars Tests' {
+    Context 'Alias TabExpansion Tests' {
         BeforeAll {
             [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
-            $repoPath = NewGitTempRepo
+            $repoPath = NewGitTempRepo -MakeInitialCommit
+        }
+        AfterAll {
+            RemoveGitTempRepo $repoPath
+        }
+        It 'Tab completes when there are multiple aliases of the same name' {
+            $addedAlias = $false
+            if (!(git config --global --get alias.co)) {
+                git.exe config --global alias.co checkout
+                $addedAlias = $true
+            }
+
+            try {
+                git.exe config alias.co checkout
+                (git.exe config --get-regexp alias\.).Count | Should Be 2
 
-            'readme' | Out-File .\README.md -Encoding ascii
-            git.exe add .\README.md
-            git.exe commit -m "initial commit."
+                $result = & $module GitTabExpansionInternal 'git co ma'
+                $result | Should BeExactly 'master'
+            }
+            finally {
+                if ($addedAlias) {
+                    git config --global --unset alias.co
+                }
+            }
+        }
+    }
+
+    Context 'PowerShell Special Chars Tests' {
+        BeforeAll {
+            [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
+            $repoPath = NewGitTempRepo -MakeInitialCommit
         }
         AfterAll {
             RemoveGitTempRepo $repoPath