浏览代码

chore(async): reenable async prompt by default on zsh < 5.0.6 (#12358)

Fixes #12331
Marc Cornellà 4 周之前
父节点
当前提交
0c80a063c3
共有 1 个文件被更改,包括 6 次插入10 次删除
  1. 6 10
      lib/git.zsh

+ 6 - 10
lib/git.zsh

@@ -39,21 +39,17 @@ function _omz_git_prompt_info() {
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 }
 
 
-# Use async version if setting is enabled, or undefined but zsh version is at least 5.0.6
-# https://github.com/ohmyzsh/ohmyzsh/issues/12331#issuecomment-2059460268
-if zstyle -t ':omz:alpha:lib:git' async-prompt \
-  || { is-at-least 5.0.6 && zstyle -T ':omz:alpha:lib:git' async-prompt }; then
+# Use async version if setting is enabled or undefined
+if zstyle -T ':omz:alpha:lib:git' async-prompt; then
   function git_prompt_info() {
   function git_prompt_info() {
-    setopt localoptions noksharrays
-    if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]" ]]; then
-      echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]"
+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" ]]; then
+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}"
     fi
     fi
   }
   }
 
 
   function git_prompt_status() {
   function git_prompt_status() {
-    setopt localoptions noksharrays
-    if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]" ]]; then
-      echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]"
+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" ]]; then
+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}"
     fi
     fi
   }
   }