Skip to content

Commit

Permalink
global: work around "localvar_inherit" for varname-list init
Browse files Browse the repository at this point in the history
  • Loading branch information
akinomyoga committed May 24, 2021
1 parent da1d0ff commit 5c2edfc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion archive/getopt1.sh
Expand Up @@ -3,7 +3,7 @@

# Usage
#
# local "${ble_getopt_vars[@]}"
# local "${ble_getopt_vars[@]/%/=}"
# ble-getopt-begin "progname" "m:n c:n,n k:n,n" "$@"
# ble-getopt
#
Expand Down
2 changes: 1 addition & 1 deletion contrib
Submodule contrib updated 1 files
+5 −7 prompt-git.bash
16 changes: 8 additions & 8 deletions lib/core-complete.sh
Expand Up @@ -3440,7 +3440,7 @@ function ble/complete/source:dynamic-history {
## 補完候補のデータを一つの配列に纏めたもの。
## 要素を使用する際は以下の様に変数に展開して使う。
##
## local "${_ble_complete_cand_varnames[@]}"
## local "${_ble_complete_cand_varnames[@]/%/=}"
## ble/complete/cand/unpack "${cand_pack[0]}"
##
## 先頭に ACTION が格納されているので
Expand Down Expand Up @@ -4164,7 +4164,7 @@ function ble/complete/menu-complete.class/render-item {
local menu_common_part=$_ble_complete_menu_common_part
fi

local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
ble/complete/cand/unpack "$1"

local prefix_len=$PREFIX_LEN
Expand Down Expand Up @@ -4264,7 +4264,7 @@ function ble/complete/menu-complete.class/render-item {

function ble/complete/menu-complete.class/get-desc {
local item=$1
local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
ble/complete/cand/unpack "$item"
desc="(action: $ACTION)"
ble/function#try ble/complete/action:"$ACTION"/get-desc
Expand All @@ -4274,7 +4274,7 @@ function ble/complete/menu-complete.class/onselect {
local nsel=$1 osel=$2
local insert=${_ble_complete_menu_original:-${_ble_complete_menu_comp[2]}}
if ((nsel>=0)); then
local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
ble/complete/cand/unpack "${_ble_complete_menu_items[nsel]}"
insert=$INSERT
fi
Expand Down Expand Up @@ -4523,7 +4523,7 @@ function ble/complete/insert-common {
# 一意確定の時
local ACTION=${cand_pack[0]%%:*}
if ble/is-function ble/complete/action:"$ACTION"/complete; then
local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
ble/complete/cand/unpack "${cand_pack[0]}"
ble/complete/action:"$ACTION"/complete
(($?==148)) && return 148
Expand Down Expand Up @@ -4575,7 +4575,7 @@ function ble/complete/insert-common {
## @var[out] COMP1 COMP2 COMPS COMPV comp_type comps_flags comps_fixed
## @var[out] cand_count cand_cand cand_word cand_pack
function ble/complete/insert-all {
local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
local pack beg=$COMP1 end=$COMP2 insert= suffix= index=0
for pack in "${cand_pack[@]}"; do
ble/complete/cand/unpack "$pack"
Expand Down Expand Up @@ -5511,7 +5511,7 @@ function ble/widget/menu_complete/exit {
local comps_fixed=${_ble_complete_menu0_comp[6]}

# 補完候補のロード
local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
ble/complete/cand/unpack "$pack"

ble/complete/action:"$ACTION"/complete
Expand Down Expand Up @@ -5745,7 +5745,7 @@ function ble/complete/auto-complete/.check-context {
local insert=$word suffix=
local ACTION=${cand_pack[0]%%:*}
if ble/is-function ble/complete/action:"$ACTION"/complete; then
local "${_ble_complete_cand_varnames[@]}"
local "${_ble_complete_cand_varnames[@]/%/=}"
ble/complete/cand/unpack "${cand_pack[0]}"
ble/complete/action:"$ACTION"/complete
fi
Expand Down
4 changes: 2 additions & 2 deletions lib/core-syntax.sh
Expand Up @@ -5117,7 +5117,7 @@ function ble/syntax/highlight {
ble/array#push vars "${_ble_highlight_layer_plain_VARNAMES[@]}"
ble/array#push vars "${_ble_highlight_layer_syntax_VARNAMES[@]}"

local "${vars[@]}"
local "${vars[@]/%/=}"
if [[ $cache_prefix ]] && ((${cache_prefix}_INITIALIZED++)); then
ble/util/restore-vars "$cache_prefix" "${vars[@]}"

Expand Down Expand Up @@ -6976,7 +6976,7 @@ function ble/syntax/progcolor {

# コマンド名に対しては既定の着色を実行
if [[ ${tree_words[0]} ]]; then
local "${_ble_syntax_progcolor_vars[@]}"
local "${_ble_syntax_progcolor_vars[@]/%/=}"
ble/syntax/progcolor/load-word-data "${tree_words[0]}"
[[ $wattr == - ]] && ble/syntax/progcolor/word:default
fi
Expand Down
2 changes: 1 addition & 1 deletion lib/test-util.sh
Expand Up @@ -141,7 +141,7 @@ ble/test ble/util/setexit 255 exit=255
}

function f1 {
local "${VARNAMES[@]}"
local "${VARNAMES[@]/%/=}"

name=1 x=2 y=3 count=4 data=(aa bb cc dd)
print-status
Expand Down
1 change: 1 addition & 0 deletions memo/ChangeLog.md
Expand Up @@ -146,6 +146,7 @@
- test (`test-canvas`): fix dependency on `ext/contra` `#D1525` c89aa23
- util: inherit special file descriptors `#D1552` 98835b5
- global: use `_ble_term_IFS` `#D1557` d23ad3c
- global: work around `localvar_inherit` for varname-list init `#D1566` 0000000

<!---------------------------------------------------------------------------->
# ble-0.4.0-devel2
Expand Down
4 changes: 4 additions & 0 deletions note.txt
Expand Up @@ -4626,6 +4626,10 @@ bash_tips

2021-05-23

* contrib/git-prompt.sh の変数達は localvar_inherit で駄目なのではないか [#D1566]
というか他にも同様の変数宣言の仕方をしている箇所は色々ある気がする。
→検索して修正した。

* keymap/vi: vim モード表示に関して (reported by huresche) [#D1565]
https://github.com/akinomyoga/ble.sh/issues/114

Expand Down

0 comments on commit 5c2edfc

Please sign in to comment.