Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(shell-integration:elvish): refactor to improve readability

Browse Source
This commit is contained in:
ilk
2024-05-17 18:11:00 +03:00
parent 597328432c
commit a1a97913d3
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/shell-integration/elvish/lib/ghostty-integration.elv
View File

@ -1,4 +1,41 @@
{ {
fn restore-xdg-dirs {
var integration-dir = $E:GHOSTTY_FISH_XDG_DIR
var xdg-dirs = [(str:split ':' $E:XDG_DATA_DIRS)]
var len = (count $xdg-dirs)
var index = $nil
range $len | each {|dir-index|
if (eq $xdg-dirs[$dir-index] $integration-dir) {
set index = $dir-index
break
}
}
if (eq $nil $index) { return } # will appear as an error
if (== 0 $index) {
set xdg-dirs = $xdg-dirs[1..]
} elif (== (- $len 1) $index) {
set xdg-dirs = $xdg-dirs[0..(- $len 1)]
} else {
# no builtin function for this : )
set xdg-dirs = [ (take $index $xdg-dirs) (drop (+ 1 $index) $xdg-dirs) ]
}
if (== 0 (count $xdg-dirs)) {
unset-env XDG_DATA_DIRS
} else {
set-env XDG_DATA_DIRS (str:join ':' $xdg-dirs)
}
unset-env GHOSTTY_FISH_XDG_DIR
}
if (and (has-env GHOSTTY_FISH_XDG_DIR) (has-env XDG_DATA_DIRS)) {
restore-xdg-dirs
}
}
{
# helper used by `mark-*` functions
fn set-prompt-state {|new| set-env __ghostty_prompt_state $new } fn set-prompt-state {|new| set-env __ghostty_prompt_state $new }
fn mark-prompt-start { fn mark-prompt-start {
@ -57,31 +94,27 @@
command sudo $@args command sudo $@args
} }
defer {
mark-prompt-start
report-pwd
}
var no-cursor = (eq 1 $E:GHOSTTY_SHELL_INTEGRATION_NO_CURSOR)
var no-sudo = (eq 1 $E:GHOSTTY_SHELL_INTEGRATION_NO_SUDO)
set edit:before-readline = (conj $edit:before-readline $mark-prompt-start~) set edit:before-readline = (conj $edit:before-readline $mark-prompt-start~)
set edit:after-readline = (conj $edit:after-readline $mark-output-start~) set edit:after-readline = (conj $edit:after-readline $mark-output-start~)
set edit:after-command = (conj $edit:after-command $mark-output-end~) set edit:after-command = (conj $edit:after-command $mark-output-end~)
set after-chdir = (conj $after-chdir {|_| report-pwd }) set after-chdir = (conj $after-chdir {|_| report-pwd })
var no-cursor = (eq 1 $E:GHOSTTY_SHELL_INTEGRATION_NO_CURSOR)
var no-sudo = (eq 1 $E:GHOSTTY_SHELL_INTEGRATION_NO_SUDO)
if $no-cursor { if $no-cursor {
fn beam { printf "\e[5 q" } fn beam { printf "\e[5 q" }
fn block { printf "\e[0 q" } fn block { printf "\e[0 q" }
set edit:before-readline = (conj $edit:before-readline $beam~) set edit:before-readline = (conj $edit:before-readline $beam~)
set edit:after-readline = (conj $edit:after-readline {|_| block }) set edit:after-readline = (conj $edit:after-readline {|_| block })
} }
if (and $no-sudo (not-eq ""$E:TERMINFO) (eq file (type -t sudo))) {
try {
if (not $no-sudo) { return }
if (eq "" $E:TERMINFO) { return }
if (not-eq file (type -t sudo)) { return }
# overwrite root namespace `sudo`
edit:add-var sudo~ $sudo-with-terminfo~ edit:add-var sudo~ $sudo-with-terminfo~
} catch e { nop } # catch early returns, do nothing }
mark-prompt-start
report-pwd
} }