feature/tab-expand-pwsh-alias

src/GitTabExpansion.ps1

@@ -69,6 +69,22 @@ $script:gitCommandsWithParamValues = $gitParamValues.Keys -join '|'
 $script:vstsCommandsWithShortParams = $shortVstsParams.Keys -join '|'
 $script:vstsCommandsWithLongParams = $longVstsParams.Keys -join '|'
 
+# The regular expression here is roughly follows this pattern:
+#
+# <begin anchor><whitespace>*<git>(<whitespace><parameter>)*<whitespace>+<$args><whitespace>*<end anchor>
+#
+# The delimiters inside the parameter list and between some of the elements are non-newline whitespace characters ([^\S\r\n]).
+# In those instances, newlines are only allowed if they preceded by a non-newline whitespace character.
+#
+# Begin anchor (^|[;`n])
+# Whitespace   (\s*)
+# Git Command  (?<cmd>$(GetAliasPattern git))
+# Parameters   (?<params>(([^\S\r\n]|[^\S\r\n]``\r?\n)+\S+)*)
+# $args Anchor (([^\S\r\n]|[^\S\r\n]``\r?\n)+\`$args)
+# Whitespace   (\s|``\r?\n)*
+# End Anchor   ($|[|;`n])
+$script:GitProxyCommandRegex = "(^|[;`n])(\s*)(?<cmd>$(Get-AliasPattern git))(?<params>(([^\S\r\n]|[^\S\r\n]``\r?\n)+\S+)*)(([^\S\r\n]|[^\S\r\n]``\r?\n)+\`$args)(\s|``\r?\n)*($|[|;`n])"
+
 try {
     if ($null -ne (git help -a 2>&1 | Select-String flow)) {
         $script:someCommands += 'flow'
@@ -472,6 +488,34 @@ function GitTabExpansionInternal($lastBlock, $GitStatus = $null) {
     }
 }
 
+function Expand-GitProxyCommand($command) {
+    # Make sure the incoming command matches: <Command> <Args>, so we can extract the alias/command
+    # name and the arguments being passed in.
+    if ($command -notmatch '^(?<command>\S+)([^\S\r\n]|[^\S\r\n]`\r?\n)+(?<args>([^\S\r\n]|[^\S\r\n]`\r?\n|\S)*)$') {
+        return $command
+    }
+
+    # Store arguments for replacement later
+    $arguments = $matches['args']
+
+    # Get the command name; if an alias exists, get the actual command name
+    $commandName = $matches['command']
+    if (Test-Path -Path Alias:\$commandName) {
+        $commandName = Get-Item -Path Alias:\$commandName | Select-Object -ExpandProperty 'ResolvedCommandName'
+    }
+
+    # Extract definition of git usage
+    if (Test-Path -Path Function:\$commandName) {
+        $definition = Get-Item -Path Function:\$commandName | Select-Object -ExpandProperty 'Definition'
+        if ($definition -match $script:GitProxyCommandRegex) {
+            # Clean up the command by removing extra delimiting whitespace and backtick preceding newlines
+            return (("$($matches['cmd'].TrimStart()) $($matches['params']) $arguments") -replace '`\r?\n', ' ' -replace '\s+', ' ')
+        }
+    }
+
+    return $command
+}
+
 function WriteTabExpLog([string] $Message) {
     if (!$global:GitTabSettings.EnableLogging) { return }
 
@@ -481,6 +525,9 @@ function WriteTabExpLog([string] $Message) {
 
 if (!$UseLegacyTabExpansion -and ($PSVersionTable.PSVersion.Major -ge 6)) {
     $cmdNames = "git","tgit","gitk"
+    if ($EnableProxyCommandExpansion) {
+        $cmdNames += Get-ChildItem -Path Function:\ | Where-Object { $_.Definition -match $script:GitProxyCommandRegex } | Select-Object -ExpandProperty 'Name'
+    }
     $cmdNames += Get-Alias -Definition $cmdNames -ErrorAction Ignore | ForEach-Object Name
 
     Microsoft.PowerShell.Core\Register-ArgumentCompleter -CommandName $cmdNames -Native -ScriptBlock {
@@ -491,6 +538,9 @@ if (!$UseLegacyTabExpansion -and ($PSVersionTable.PSVersion.Major -ge 6)) {
         # The Expand-GitCommand expects this trailing space, so pad with a space if necessary.
         $padLength = $cursorPosition - $commandAst.Extent.StartOffset
         $textToComplete = $commandAst.ToString().PadRight($padLength, ' ').Substring(0, $padLength)
+        if ($EnableProxyCommandExpansion) {
+            $textToComplete = Expand-GitProxyCommand($textToComplete)
+        }
 
         WriteTabExpLog "Expand: command: '$($commandAst.Extent.Text)', padded: '$textToComplete', padlen: $padLength"
         Expand-GitCommand $textToComplete
@@ -504,6 +554,9 @@ else {
 
             $line = $Context.Line
             $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart()
+            if ($EnableProxyCommandExpansion) {
+                $lastBlock = Expand-GitProxyCommand($lastBlock)
+            }
             $TabExpansionHasOutput.Value = $true
             WriteTabExpLog "PowerTab expand: '$lastBlock'"
             Expand-GitCommand $lastBlock
@@ -514,6 +567,9 @@ else {
 
     function TabExpansion($line, $lastWord) {
         $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart()
+        if ($EnableProxyCommandExpansion) {
+            $lastBlock = Expand-GitProxyCommand($lastBlock)
+        }
         $msg = "Legacy expand: '$lastBlock'"
 
         switch -regex ($lastBlock) {

src/posh-git.psm1

@@ -1,4 +1,4 @@
-param([bool]$ForcePoshGitPrompt, [bool]$UseLegacyTabExpansion)
+param([bool]$ForcePoshGitPrompt, [bool]$UseLegacyTabExpansion, [bool]$EnableProxyCommandExpansion)
 
 . $PSScriptRoot\CheckRequirements.ps1 > $null