(#3364) Use new tab-expansion from PowerShell v5

The newer method is available from v5 and up, so we have no need to wait for v7.4+ to change over. This will also let us remove the fallback earlier, once we no longer support PS <5.0.
chocolatey · Nov 4, 2024 · 53dc7e0 · 53dc7e0
1 parent 3be2a2b
commit 53dc7e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1 b/src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1
@@ -264,8 +264,8 @@ if ($PowerTab_RegisterTabExpansion) {
     return
 }
 
-# PowerShell up to v7.3.x: use a custom TabExpansion function.
-if ($PSVersionTable.PSVersion.Major -lt 7 -or ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -lt 4)) { 
+# PowerShell up to v5.x: use a custom TabExpansion function.
+if ($PSVersionTable.PSVersion.Major -lt 5) { 
     if (Test-Path Function:\TabExpansion) {
         Rename-Item Function:\TabExpansion TabExpansionBackup
     }
@@ -288,7 +288,8 @@ if ($PSVersionTable.PSVersion.Major -lt 7 -or ($PSVersionTable.PSVersion.Major -
             }
         }
     }
-} else { # PowerShell v7.4+: use the Register-ArgumentCompleter cmdlet (PowerShell no longer calls TabExpansion)
+}
+else { # PowerShell v5+: use the Register-ArgumentCompleter cmdlet (PowerShell no longer calls TabExpansion after 7.4, but this available from 5.x)
     function script:Get-AliasNames($exe) {
         @($exe) + @(Get-Alias | Where-Object { $_.Definition -eq $exe } | Select-Object -Exp Name)
     }

diff --git a/src/chocolatey.resources/helpers/chocolateyProfile.psm1 b/src/chocolatey.resources/helpers/chocolateyProfile.psm1
@@ -28,8 +28,8 @@ Import-Module "$thisDirectory\Chocolatey.PowerShell.dll" -Cmdlet "Get-Environmen
 Set-Alias refreshenv Update-SessionEnvironment
 
 Export-ModuleMember -Alias refreshenv -Cmdlet 'Update-SessionEnvironment'
-if ($PSVersionTable.PSVersion.Major -lt 7 -or ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -lt 4)) { 
-    Export-ModuleMember -Function 'TabExpansion' # Legacy TabExpansion function is only used up to PowerShell v7.3.x
+if ($PSVersionTable.PSVersion.Major -lt 5) { 
+    Export-ModuleMember -Function 'TabExpansion' # Legacy TabExpansion function is only used up to PowerShell v5.x
 }
 
 # SIG # Begin signature block