Revert "545 bug bad math expression in zinit plugins on ubuntu 2204ws…

…l2 (#559)" This reverts commit 58a694b.
zdharma-continuum · Aug 12, 2023 · 2548085 · 2548085
1 parent 58a694b
commit 2548085
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/doc/zsdoc/zinit-autoload.zsh.adoc b/doc/zsdoc/zinit-autoload.zsh.adoc
@@ -842,7 +842,7 @@ ____
 Has 21 line(s). Calls functions:
 
  .zinit-list-plugins
- `-- zinit.zsh/+zi-log
+ `-- zinit.zsh/+zinit-message
 
 Uses feature(s): _setopt_
 

diff --git a/doc/zsdoc/zinit.zsh.adoc b/doc/zsdoc/zinit.zsh.adoc
@@ -232,7 +232,6 @@ Called by:
  zinit-additional.zsh/.zinit-debug-status
  zinit-additional.zsh/.zinit-debug-stop
  zinit-additional.zsh/:zinit-tmp-subst-source
- zinit-autoload.zsh/.zinit-list-plugins
  zinit-autoload.zsh/.zinit-unload
 
 ==== +zinit-deploy-message
@@ -282,6 +281,7 @@ Called by:
  zinit-autoload.zsh/.zinit-confirm
  zinit-autoload.zsh/.zinit-delete
  zinit-autoload.zsh/.zinit-glance
+ zinit-autoload.zsh/.zinit-list-plugins
  zinit-autoload.zsh/.zinit-self-update
  zinit-autoload.zsh/.zinit-show-zstatus
  zinit-autoload.zsh/.zinit-uninstall-completions

diff --git a/tests/commands.zunit b/tests/commands.zunit
@@ -10,7 +10,6 @@
 @setup {
   ZBIN="${ZPFX}/bin"
 }
-
 @test 'delete --help' {
   run zinit delete --help
   assert $output contains 'zinit delete [options] [plugins...]'
@@ -36,12 +35,4 @@
     assert $state equals 0
 }
 
-@test 'plugins' {
-  run zinit plugins
-  assert $output contains 'Plugins'
-  assert $output contains 'Unloaded: '
-  assert $output contains 'Loaded: '
-  assert $state equals 0
-}
-
 # vim:ft=zsh:sw=2:sts=2:et:foldmarker={,}:foldmethod=marker
diff --git a/zinit-autoload.zsh b/zinit-autoload.zsh
@@ -1554,20 +1554,20 @@ print -- "\nAvailable ice-modifiers:\n\n${ice_order[*]}"
      keyword="${keyword## ##}"
      keyword="${keyword%% ##}"
      if [[ -n "$keyword" ]]; then
-         +zi-log "{i} Installed plugins matching {info}$keyword{rst}:"
+         +zinit-message "{i} Installed plugins matching {info}$keyword{rst}:"
          filtered=( "${(M)ZINIT[@]:#STATES__*$keyword*}" )
      else
          filtered=(${${(M)${(k)ZINIT[@]}:##STATES__*}//[A-Z]*__/})
      fi
      local i
-     +zi-log '{m} {b}Plugins{rst}'
+     +zinit-message '{m} {b}Plugins{rst}'
      for i in "${(o)filtered[@]}"; do
          [[ "$i" = "local/zinit" ]] && continue
          local is_loaded='{error}U'
-         (( ZINIT[STATES__${i}] )) && is_loaded="{happy}L"
-         +zi-log -C2 -- $is_loaded{rst} $i
+         (( "ZINIT[STATES__$i]" )) && is_loaded="{happy}L"
+         +zinit-message -C2 -- $is_loaded{rst} $i
      done
-     +zi-log -- '{nl}Loaded: {happy}L{rst} | Unloaded: {error}U{rst}'
+     +zinit-message -- '{nl}Loaded: {happy}L{rst} | Unloaded: {error}U{rst}'
 } # ]]]
 # FUNCTION: .zinit-list-snippets [[[
 .zinit-list-snippets() {