Set Scheme for history functions (#226)

- Add Scheme option - Use Scheme option in history functions - Resolves Better default behavior for post fzf 0.32.0 #211
kelleyma49 · Jun 11, 2023 · 051a0da · 051a0da
1 parent fc9e2f3
commit 051a0da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/PSFzf.Base.ps1 b/PSFzf.Base.ps1
@@ -265,6 +265,9 @@ function Invoke-Fzf {
 			[Alias('i')]
 		  	[switch]$CaseInsensitive,
 		  	[switch]$CaseSensitive,
+			[ValidateSet('default','path','history')]
+		  	[string]
+		  	$Scheme = $null,
 		  	[Alias('d')]
 		  	[string]$Delimiter,
 		  	[switch]$NoSort,
@@ -341,6 +344,7 @@ function Invoke-Fzf {
 		if ($PSBoundParameters.ContainsKey('Exact') -and $Exact) 			        							{ $arguments += '--exact '}
 		if ($PSBoundParameters.ContainsKey('CaseInsensitive') -and $CaseInsensitive) 							{ $arguments += '-i '}
 		if ($PSBoundParameters.ContainsKey('CaseSensitive') -and $CaseSensitive) 								{ $arguments += '+i '}
+		if ($PSBoundParameters.ContainsKey('Scheme') -and ![string]::IsNullOrWhiteSpace($Scheme)) 				{ $arguments += "--scheme=$Scheme "}
 		if ($PSBoundParameters.ContainsKey('Delimiter') -and ![string]::IsNullOrWhiteSpace($Delimiter)) 		{ $arguments += "--delimiter=$Delimiter "}
 		if ($PSBoundParameters.ContainsKey('NoSort') -and $NoSort) 												{ $arguments += '--no-sort '}
 		if ($PSBoundParameters.ContainsKey('ReverseInput') -and $ReverseInput) 									{ $arguments += '--tac '}
@@ -776,7 +780,7 @@ function Invoke-FzfPsReadlineHandlerHistory {
 				$fileHist.Add($_,$true)
 				$_
 			}
-		} | Invoke-Fzf -Query "$line" -Bind ctrl-r:toggle-sort | ForEach-Object { $result = $_ }
+		} | Invoke-Fzf -Query "$line" -NoSort -Bind ctrl-r:toggle-sort -Scheme history | ForEach-Object { $result = $_ }
 	}
 	catch
 	{

diff --git a/PSFzf.Functions.ps1 b/PSFzf.Functions.ps1
@@ -161,10 +161,10 @@ function Invoke-FuzzyFasd() {
 #.ExternalHelp PSFzf.psm1-help.xml
 function Invoke-FuzzyHistory() {
     if (Get-Command Get-PSReadLineOption -ErrorAction Ignore) {
-        $result = Get-Content (Get-PSReadLineOption).HistorySavePath | Invoke-Fzf -Reverse -NoSort
+        $result = Get-Content (Get-PSReadLineOption).HistorySavePath | Invoke-Fzf -Reverse -NoSort -Scheme history
     }
     else {
-        $result = Get-History | ForEach-Object { $_.CommandLine } | Invoke-Fzf -Reverse -NoSort
+        $result = Get-History | ForEach-Object { $_.CommandLine } | Invoke-Fzf -Reverse -NoSort -Scheme history
     }
     if ($null -ne $result) {
         Write-Output "Invoking '$result'`n"