Prefix builtin for bindkey, echo, print, shift, return, zle, autoload

Defensive in case there are aliases and whatnot

Author: jedahan

geometry.zsh

@@ -4,7 +4,7 @@
 # pure: https://github.com/sindresorhus/pure
 # mnml: https://github.com/subnixr/minimal
 
-typeset -gA GEOMETRY; GEOMETRY[ROOT]=${0:A:h}
+builtin typeset -gA GEOMETRY; GEOMETRY[ROOT]=${0:A:h}
 
 (($+GEOMETRY_PROMPT)) || GEOMETRY_PROMPT=(geometry_echo geometry_status geometry_path)
 (($+GEOMETRY_RPROMPT)) || GEOMETRY_RPROMPT=(geometry_exec_time geometry_git geometry_hg geometry_jj geometry_echo)
@@ -13,7 +13,7 @@ typeset -gA GEOMETRY; GEOMETRY[ROOT]=${0:A:h}
 (($+GEOMETRY_CMDTITLE)) || GEOMETRY_CMDTITLE=(geometry_cmd geometry_hostname)
 (($+GEOMETRY_PATH_TRUNCATE)) || GEOMETRY_PATH_TRUNCATE=3
 
-autoload -U add-zsh-hook
+builtin autoload -U add-zsh-hook
 
 function {
 local fun
@@ -40,9 +40,9 @@ for fun (
 ) . "${GEOMETRY[ROOT]}"/functions/$fun
 }
 
-(( $+functions[ansi] )) || ansi() { (($# - 2)) || echo -n "%F{$1}$2%f"; }
-(( $+functions[deansi] )) || deansi() { (($# - 1)) || echo -n "$(echo "$1" | sed s/$(echo "\033")\\\[\[0-9\]\\\{1,2\\\}m//g)"; }
-(( $+functions[geometry_cmd])) || geometry_cmd() { echo $GEOMETRY_LAST_CMD }
+(( $+functions[geometry_cmd])) || geometry_cmd() { builtin echo $GEOMETRY_LAST_CMD; }
+(( $+functions[ansi] )) || ansi() { (($# - 2)) || builtin echo -n "%F{$1}$2%f"; }
+(( $+functions[deansi] )) || deansi() { (($# - 1)) || builtin echo -n "$(echo "$1" | sed s/$(builtin echo "\033")\\\[\[0-9\]\\\{1,2\\\}m//g)"; }
 
 # Takes number of seconds and formats it for humans
 # from https://github.com/sindresorhus/pretty-time-zsh
@@ -68,8 +68,8 @@ geometry::time() {
 # Generate a color based on hostname.
 geometry::hostcolor() {
   if (( ${+GEOMETRY_HOST_COLOR} )); then
-    echo ${GEOMETRY_HOST_COLOR}
-    return
+    builtin echo ${GEOMETRY_HOST_COLOR}
+    builtin return
   fi
 
   if (( ${+GEOMETRY_HOST_COLORS} )); then
@@ -79,22 +79,22 @@ geometry::hostcolor() {
     (($(echotc Co) == 256)) && colors+=({17..230})
   fi
 
-  local sum=0; for c in ${(s::)^HOST}; do ((sum += $(print -f '%d' "'$c"))); done
+  local sum=0; for c in ${(s::)^HOST}; do ((sum += $(builtin print -f '%d' "'$c"))); done
   local index="$(($sum % ${#colors}))"
 
   [[ "$index" -eq 0 ]] && index = 1
 
-  echo ${colors[${index}]}
+  builtin echo ${colors[${index}]}
 }
 
 # set cmd title (while command is running)
 geometry::set_cmdtitle() {
   # Make command title available for optional consumption by geometry_cmd
   GEOMETRY_LAST_CMD=$2
-  local ansiCmdTitle=$(print -P $(geometry::wrap $PWD $GEOMETRY_CMDTITLE))
+  local ansiCmdTitle=$(builtin print -P $(geometry::wrap $PWD $GEOMETRY_CMDTITLE))
   local cmdTitle=$(deansi "$ansiCmdTitle")
 
-  echo -ne "\e]1;$cmdTitle\a"
+  builtin echo -ne "\e]1;$cmdTitle\a"
 }
 add-zsh-hook preexec geometry::set_cmdtitle
 
@@ -103,7 +103,7 @@ geometry::set_title() {
   local ansiTitle=$(print -P $(geometry::wrap $PWD $GEOMETRY_TITLE))
   local title=$(deansi "$ansiTitle")
 
-  echo -ne "\e]1;$title\a"
+  builtin echo -ne "\e]1;$title\a"
 }
 add-zsh-hook precmd geometry::set_title
 
@@ -112,26 +112,26 @@ geometry::wrap() {
   setopt localoptions noautopushd; builtin cd -q $1
   local -a outputs
   local cmd output
-  shift
+  builtin shift
   for cmd in $@; do output=$($cmd); ( (( $? )) || [[ -z "${output// }" ]] ) || outputs+=$output; done
 
-  echo "${(ej.${GEOMETRY_SEPARATOR:- }.)outputs}"
+  builtin echo "${(ej.${GEOMETRY_SEPARATOR:- }.)outputs}"
 }
 
 geometry::rprompt::set() {
   if [[ -z "$2" || "$2" == "hup" ]]; then
     read -r -u "$GEOMETRY_ASYNC_FD" RPROMPT
-    zle reset-prompt
+    builtin zle reset-prompt
     exec {1}<&-
   fi
-  zle -F "$1"
+  builtin zle -F "$1"
 }
 
 geometry::rprompt() {
-  typeset -g GEOMETRY_ASYNC_FD=
+  builtin typeset -g GEOMETRY_ASYNC_FD=
   RPROMPT=
   exec {GEOMETRY_ASYNC_FD}< <(geometry::wrap $PWD $GEOMETRY_RPROMPT)
-  zle -F "$GEOMETRY_ASYNC_FD" geometry::rprompt::set
+  builtin zle -F "$GEOMETRY_ASYNC_FD" geometry::rprompt::set
 }
 
 geometry::prompt() {
@@ -144,11 +144,11 @@ add-zsh-hook precmd geometry::prompt
 add-zsh-hook precmd geometry::rprompt
 
 geometry::info() { # draw info if no command is given
-    [[ -n "$BUFFER" ]] && { zle accept-line && return; }
-    [[ -z "$GEOMETRY_INFO" ]] && { zle accept-line && return; }
-    echo ${(%):-$(geometry::wrap $PWD $GEOMETRY_INFO)}
+    [[ -n "$BUFFER" ]] && { builtin zle accept-line && builtin return; }
+    [[ -z "$GEOMETRY_INFO" ]] && { builtin zle accept-line && builtin return; }
+    builtin echo ${(%):-$(geometry::wrap $PWD $GEOMETRY_INFO)}
     geometry::prompt
 }
-zle -N buffer-empty geometry::info
-bindkey '^M' buffer-empty
+builtin zle -N buffer-empty geometry::info
+builtin bindkey '^M' buffer-empty
 ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=buffer-empty