Fix #854 - PowerShell aliases against app with .exe ext doesn't work #855
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add RegisteredCommands field to GitTabSettings for debug purposes.
dahlbyk
approved these changes
Apr 12, 2021
src/GitTabExpansion.ps1
Outdated
| @@ -537,10 +538,21 @@ function WriteTabExpLog([string] $Message) { | |||
|
|
|||
| if (!$UseLegacyTabExpansion -and ($PSVersionTable.PSVersion.Major -ge 6)) { | |||
| $cmdNames = "git","tgit","gitk" | |||
|
|
|||
| # Create regex pattern from $cmdNames: ^(git|git\.exe|tgit|tgit\.exe|gitk|gitk\.exe)$ | |||
| $cmdNamesPattern = "^($(($cmdNames | ForEach-Object { "${_}|${_}\.exe" }) -join '|'))$" | |||
There was a problem hiding this comment.
Simpler to just optionally match .exe at the end?
Suggested change
| $cmdNamesPattern = "^($(($cmdNames | ForEach-Object { "${_}|${_}\.exe" }) -join '|'))$" | |
| $cmdNamesPattern = "^($($cmdNames -join '|'))(\.exe)?$" |
src/GitUtils.ps1
Outdated
| @@ -442,7 +442,7 @@ function InDotGitOrBareRepoDir([string][ValidateNotNullOrEmpty()]$GitDir) { | |||
| } | |||
|
|
|||
| function Get-AliasPattern($cmd) { | |||
| $aliases = @($cmd) + @(Get-Alias | Where-Object { $_.Definition -eq $cmd } | Select-Object -Exp Name) | |||
| $aliases = @($cmd) + @(Get-Alias | Where-Object { $_.Definition -match "^($cmd|$cmd\.exe)$" } | Foreach-Object Name) | |||
There was a problem hiding this comment.
Suggested change
| $aliases = @($cmd) + @(Get-Alias | Where-Object { $_.Definition -match "^($cmd|$cmd\.exe)$" } | Foreach-Object Name) | |
| $aliases = @($cmd) + @(Get-Alias | Where-Object { $_.Definition -match "^$cmd(\.exe)?$" } | Foreach-Object Name) |
Comment on lines
+550
to
+552
| # Create regex pattern from $funcNames e.g.: ^(Git-Checkout|Git-Switch)$ | ||
| $funcNamesPattern = "^($($funcNames -join '|'))$" | ||
| $cmdNames += Get-Alias | Where-Object { $_.Definition -match $funcNamesPattern } | Foreach-Object Name |
There was a problem hiding this comment.
Add test for helper function alias match?
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add RegisteredCommands field to GitTabSettings for debug purposes.