@@ -91,27 +91,47 @@ _zsh_abbr() {
91
91
if [[ $scope == ' session' ]]; then
92
92
if [[ $type == ' global' ]]; then
93
93
if (( ${+ZSH_ABBR_SESSION_GLOBALS[$abbreviation]} )) ; then
94
- unset " ZSH_ABBR_SESSION_GLOBALS[${(b)abbreviation} ]"
94
+ if (( dry_run )) ; then
95
+ echo " Erase ${type:- regular} ${scope:- user} abbreviation $abbeviation "
96
+ else
97
+ unset " ZSH_ABBR_SESSION_GLOBALS[${(b)abbreviation} ]"
98
+ fi
99
+
95
100
success=1
96
101
fi
97
102
elif (( ${+ZSH_ABBR_SESSION_COMMANDS[$abbreviation]} )) ; then
98
- unset " ZSH_ABBR_SESSION_COMMANDS[${(b)abbreviation} ]"
103
+ if (( dry_run )) ; then
104
+ echo " Erase ${type:- regular} ${scope:- user} abbreviation $abbeviation "
105
+ else
106
+ unset " ZSH_ABBR_SESSION_COMMANDS[${(b)abbreviation} ]"
107
+ fi
108
+
99
109
success=1
100
110
fi
101
111
else
102
112
if [[ $type == ' global' ]]; then
103
113
source " ${TMPDIR:-/ tmp/ } zsh-user-global-abbreviations"
104
114
105
115
if (( ${+ZSH_ABBR_USER_GLOBALS[$abbreviation]} )) ; then
106
- unset " ZSH_ABBR_USER_GLOBALS[${(b)abbreviation} ]"
116
+ if (( dry_run )) ; then
117
+ echo " Erase ${type:- regular} ${scope:- user} abbreviation $abbeviation "
118
+ else
119
+ unset " ZSH_ABBR_USER_GLOBALS[${(b)abbreviation} ]"
120
+ fi
121
+
107
122
util_sync_user
108
123
success=1
109
124
fi
110
125
else
111
126
source " ${TMPDIR:-/ tmp/ } zsh-user-abbreviations"
112
127
113
128
if (( ${+ZSH_ABBR_USER_COMMANDS[$abbreviation]} )) ; then
114
- unset " ZSH_ABBR_USER_COMMANDS[${(b)abbreviation} ]"
129
+ if (( dry_run )) ; then
130
+ echo " Erase ${type:- regular} ${scope:- user} abbreviation $abbeviation "
131
+ else
132
+ unset " ZSH_ABBR_USER_COMMANDS[${(b)abbreviation} ]"
133
+ fi
134
+
115
135
util_sync_user
116
136
success=1
117
137
fi
@@ -121,7 +141,7 @@ _zsh_abbr() {
121
141
_zsh_abbr_job_pop $job $job_group
122
142
123
143
if ! (( success )) ; then
124
- util_error " erase: No $type $ scope abbreviation $abbreviation found"
144
+ util_error " erase: No ${ type:- regular} ${ scope:- user} abbreviation $abbreviation found"
125
145
fi
126
146
}
127
147
@@ -345,14 +365,9 @@ _zsh_abbr() {
345
365
fi
346
366
fi
347
367
348
- if [[ -n " $expansion " ] ]; then
368
+ if [ $expansion ]; then
349
369
util_add $new_abbreviation $expansion
350
-
351
- if ! (( dry_run )) ; then
352
- erase $current_abbreviation
353
- else
354
- echo " abbr -e $current_abbreviation "
355
- fi
370
+ erase $current_abbreviation
356
371
else
357
372
util_error " rename: No matching abbreviation $current_abbreviation exists"
358
373
fi
0 commit comments