mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 20:39:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(shell): perform cleanup for a new initialization

Browse source
This commit is contained in:
L. Yeung 2022-08-23 00:41:27 +08:00 committed by Jan De Dobbeleer
parent 8de89185e2
commit 4e25c7c1c9
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shell/scripts/omp.fish
View file

@ -55,6 +55,14 @@ function postexec_omp --on-event fish_postexec
set --global --export omp_lastcommand $argv set --global --export omp_lastcommand $argv
end end
# perform cleanup so a new initialization in current session works
if test "$(string match -e '_render_transient' $(bind \r --user 2>/dev/null))" != ''
bind -e \r
end
if test "$(string match -e '_render_tooltip' $(bind \x20 --user 2>/dev/null))" != ''
bind -e \x20
end
# tooltip # tooltip
function _render_tooltip function _render_tooltip

14
src/shell/scripts/omp.ps1
View file

@ -102,7 +102,7 @@ New-Module -Name "oh-my-posh-core" -ScriptBlock {
} }
if ("::TOOLTIPS::" -eq "true") { if ("::TOOLTIPS::" -eq "true") {
Set-PSReadLineKeyHandler -Key SpaceBar -ScriptBlock { Set-PSReadLineKeyHandler -Key Spacebar -BriefDescription 'OhMyPoshSpaceKeyHandler' -ScriptBlock {
[Microsoft.PowerShell.PSConsoleReadLine]::Insert(' ') [Microsoft.PowerShell.PSConsoleReadLine]::Insert(' ')
$position = $host.UI.RawUI.CursorPosition $position = $host.UI.RawUI.CursorPosition
$cleanPWD, $cleanPSWD = Get-PoshContext $cleanPWD, $cleanPSWD = Get-PoshContext
@ -118,7 +118,7 @@ New-Module -Name "oh-my-posh-core" -ScriptBlock {
} }
if ("::TRANSIENT::" -eq "true") { if ("::TRANSIENT::" -eq "true") {
Set-PSReadLineKeyHandler -Key Enter -ScriptBlock { Set-PSReadLineKeyHandler -Key Enter -BriefDescription 'OhMyPoshEnterKeyHandler' -ScriptBlock {
$previousOutputEncoding = [Console]::OutputEncoding $previousOutputEncoding = [Console]::OutputEncoding
try { try {
$parseErrors = $null $parseErrors = $null
@ -350,6 +350,16 @@ Example:
function Enable-PoshTransientPrompt {} function Enable-PoshTransientPrompt {}
function Enable-PoshLineError {} function Enable-PoshLineError {}
# perform cleanup on removal so a new initialization in current session works
$ExecutionContext.SessionState.Module.OnRemove += {
if ((Get-PSReadLineKeyHandler -Key Spacebar).Function -eq 'OhMyPoshSpaceKeyHandler') {
Remove-PSReadLineKeyHandler -Key Spacebar
}
if ((Get-PSReadLineKeyHandler -Key Enter).Function -eq 'OhMyPoshEnterKeyHandler') {
Set-PSReadLineKeyHandler -Key Enter -Function AcceptLine
}
}
Export-ModuleMember -Function @( Export-ModuleMember -Function @(
"Set-PoshContext" "Set-PoshContext"
"Enable-PoshTooltips" "Enable-PoshTooltips"

16
src/shell/scripts/omp.zsh
View file

@ -42,7 +42,15 @@ if [ "$TERM" != "linux" ]; then
_install-omp-hooks _install-omp-hooks
fi fi
function self-insert() { # perform cleanup so a new initialization in current session works
if [[ "$(zle -lL self-insert)" = *"_posh-self-insert"* ]]; then
zle -N self-insert
fi
if [[ "$(zle -lL zle-line-init)" = *"_posh-zle-line-init"* ]]; then
zle -N zle-line-init
fi
function _posh-self-insert() {
# ignore an empty buffer # ignore an empty buffer
if [[ -z "$BUFFER" ]]; then if [[ -z "$BUFFER" ]]; then
zle .self-insert zle .self-insert
@ -50,10 +58,10 @@ function self-insert() {
fi fi
# trigger a tip check only if the input is a space character # trigger a tip check only if the input is a space character
if [[ "$KEYS" = " " ]]; then if [[ "$KEYS" = " " ]]; then
tooltip=$(::OMP:: print tooltip --config="$POSH_THEME" --shell=zsh --error="$omp_last_error" --command="$BUFFER" --shell-version="$ZSH_VERSION") local tooltip=$(::OMP:: print tooltip --config="$POSH_THEME" --shell=zsh --error="$omp_last_error" --command="$BUFFER" --shell-version="$ZSH_VERSION")
fi fi
# ignore an empty tooltip # ignore an empty tooltip
if [[ ! -z "$tooltip" ]]; then if [[ -n "$tooltip" ]]; then
RPROMPT=$tooltip RPROMPT=$tooltip
zle .reset-prompt zle .reset-prompt
fi fi
@ -61,7 +69,7 @@ function self-insert() {
} }
if [[ "::TOOLTIPS::" = "true" ]]; then if [[ "::TOOLTIPS::" = "true" ]]; then
zle -N self-insert zle -N self-insert _posh-self-insert
fi fi
function _posh-zle-line-init() { function _posh-zle-line-init() {