Merge 2cd77de6a0 into 3308262dfb

39d34dff add a CHECK to Arena.Allocate<T>(n)

git-subtree-dir: gitstatus
git-subtree-split: 39d34dff4456067a0df17bdf1ea74b07c1983b39

config/p10k-classic.zsh

@@ -1126,7 +1126,7 @@
   # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
   # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
   #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
   # Custom icon.
   # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
 

config/p10k-lean-8colors.zsh

@@ -1101,7 +1101,7 @@
   # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
   # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
   #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
   # Custom icon.
   # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
 

config/p10k-lean.zsh

@@ -1101,7 +1101,7 @@
   # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
   # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
   #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
   # Custom icon.
   # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
 

config/p10k-rainbow.zsh

@@ -1203,7 +1203,7 @@
   # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
   # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
   #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
 
   # Custom icon.
   # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

gitstatus/mbuild

@@ -94,7 +94,9 @@
 setopt no_unset extended_glob pipe_fail prompt_percent typeset_silent \
   no_prompt_subst no_prompt_bang pushd_silent warn_create_global
 
-if [[ $ZSH_VERSION != (5.<1->*|<6->.*) || $ZSH_VERSION == 5.4(|.*) ]]; then
+autoload -Uz is-at-least
+
+if ! is-at-least 5.1 || [[ $ZSH_VERSION == 5.4.* ]]; then
   print -ru2 -- "[error] unsupported zsh version: $ZSH_VERSION"
   return 1
 fi

gitstatus/src/arena.h

@@ -27,6 +27,7 @@
 #include <type_traits>
 #include <vector>
 
+#include "check.h"
 #include "string_view.h"
 
 namespace gitstatus {
@@ -94,6 +95,7 @@ class Arena {
   template <class T>
   inline T* Allocate(size_t n) {
     static_assert(!std::is_reference<T>(), "");
+    CHECK(n <= SIZE_MAX / sizeof(T)) << n;
     return static_cast<T*>(Allocate(n * sizeof(T), alignof(T)));
   }
 

internal/p10k.zsh

@@ -1352,6 +1352,16 @@ _p9k_prompt_battery_init() {
     _p9k__async_segments_compute+='_p9k_worker_invoke battery _p9k_prompt_battery_compute'
     return
   fi
+
+  if [[ $_p9k_os == Windows ]]; then
+    if command -v wmic > /dev/null 2>&1; then # Test "wimc" command
+      _p9k__async_segments_compute+='_p9k_worker_invoke battery _p9k_prompt_battery_compute'
+      return
+    else
+      typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${:-}'
+    fi
+  fi
+
   if [[ $_p9k_os != (Linux|Android) ||
         -z /sys/class/power_supply/(CMB*|BAT*|*battery)/(energy_full|charge_full|charge_counter)(#qN) ]]; then
     typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${:-}'
@@ -1464,6 +1474,54 @@ _p9k_prompt_battery_set_args() {
       fi
     ;;
 
+    Windows)
+      local raw_data
+      local -a info_values
+      # See definitions to Win32_Battery class members at https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-battery
+      {
+        read -r 2>/dev/null
+        read -r raw_data
+      } <<< "$(wmic path Win32_Battery get BatteryStatus,EstimatedChargeRemaining,EstimatedRunTime)"
+
+      # info_values[1]: BatteryStatus
+      # info_values[2]: EstimatedChargeRemaining
+      # info_values[3]: EstimatedRunTime
+      info_values=(${(s: :)raw_data})
+
+      (( ${#info_values[@]} == 4 )) || return # Missing info_values (index [4] is for the following CRCR)
+      
+      bat_percent=${info_values[2]}
+      local -i bat_remain_minutes=${info_values[3]}
+
+      case ${info_values[1]} in 
+        '1'|'4'|'5')
+            # When the battery is charging or full, system will show that bat_remain_minutes (EstimatedRunTime) is 71582788 (min)
+            (( bat_remain_minutes < 71582788 )) && remain=$((bat_remain_minutes/60)):${(l#2##0#)$((bat_remain_minutes%60))} || remain=''
+            if (( bat_percent < _POWERLEVEL9K_BATTERY_LOW_THRESHOLD )); then
+                state=LOW
+            else
+                state=DISCONNECTED
+            fi
+        ;;
+        '2'|'6'|'7'|'8'|'9'|'11') # In this case, the battery is likely to be charged and disconnected, or still been charging.
+            remain=''
+            if (( bat_percent == 100 )); then
+                state=CHARGED
+            else
+                state=CHARGING
+            fi
+        ;;
+        '3')
+            (( bat_remain_minutes < 71582788 )) && remain=$((bat_remain_minutes/60)):${(l#2##0#)$((bat_remain_minutes%60))} || remain=''
+            state=CHARGED
+        ;;
+        *)
+            state=CHARGED
+            remain=''
+        ;;
+      esac
+    ;;
+
     *)
       return 0
     ;;
@@ -2265,7 +2323,7 @@ prompt_package() {
 
   P9K_PACKAGE_NAME=$_p9k__cache_val[2]
   P9K_PACKAGE_VERSION=$_p9k__cache_val[3]
-  _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${P9K_PACKAGE_VERSION//\%/%%}
+  _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${(V)P9K_PACKAGE_VERSION//\%/%%}
 }
 
 ################################################################
@@ -9527,7 +9585,7 @@ if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file && -n $__p9k_instant_p
   zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
 fi
 
-typeset -g P9K_VERSION=1.20.17
+typeset -g P9K_VERSION=1.20.18
 
 if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then
   typeset -gri __p9k_force_term_shell_integration=1