Обновление ohmyzsh

zsh/plugins/jump/README.md

@@ -17,3 +17,15 @@ plugins=(... jump)
 | `mark [mark-name]`   | Create a mark with the given name or with the name of the current directory if none is provided |
 | `unmark <mark-name>` | Remove the given mark                                                                           |
 | `marks`              | List the existing marks and the directories they point to                                       |
+
+## Key bindings
+
+Pressing `CTRL`+`G` substitutes the written mark name for the full path of the mark.
+For example, with a mark named `mymark` pointing to `/path/to/my/mark`:
+```zsh
+$ cp /tmp/file mymark<C-g>
+```
+will become:
+```zsh
+$ cp /tmp/file /path/to/my/mark
+```

zsh/plugins/jump/jump.plugin.zsh

@@ -9,33 +9,34 @@
 export MARKPATH=$HOME/.marks
 
 jump() {
-	cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
+	builtin cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
 }
 
 mark() {
-	if [[ ( $# == 0 ) || ( "$1" == "." ) ]]; then
-		MARK=$(basename "$PWD")
+	if [[ $# -eq 0 || "$1" = "." ]]; then
+		MARK=${PWD:t}
 	else
 		MARK="$1"
 	fi
-	if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
-		mkdir -p "$MARKPATH"; ln -sfn "$PWD" "$MARKPATH/$MARK"
+	if read -q "?Mark $PWD as ${MARK}? (y/n) "; then
+		command mkdir -p "$MARKPATH"
+		command ln -sfn "$PWD" "$MARKPATH/$MARK"
 	fi
 }
 
 unmark() {
-	rm -i "$MARKPATH/$1"
+	LANG= command rm -i "$MARKPATH/$1"
 }
 
 marks() {
-	local max=0
-	for link in $MARKPATH/*(@); do
+	local link max=0
+	for link in $MARKPATH/{,.}*(@N); do
 		if [[ ${#link:t} -gt $max ]]; then
 			max=${#link:t}
 		fi
 	done
 	local printf_markname_template="$(printf -- "%%%us " "$max")"
-	for link in $MARKPATH/*(@); do
+	for link in $MARKPATH/{,.}*(@N); do
 		local markname="$fg[cyan]${link:t}$reset_color"
 		local markpath="$fg[blue]$(readlink $link)$reset_color"
 		printf -- "$printf_markname_template" "$markname"
@@ -44,21 +45,15 @@ marks() {
 }
 
 _completemarks() {
-	if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
-		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_a-zA-Z0-9\.\-]*):$/\2/g'))
-	else
-		if readlink -e "${MARKPATH}"/* &>/dev/null; then
-			reply=($(ls "${MARKPATH}"))
-		fi
-	fi
+	reply=("${MARKPATH}"/{,.}*(@N:t))
 }
 compctl -K _completemarks jump
 compctl -K _completemarks unmark
 
 _mark_expansion() {
-	setopt extendedglob
+	setopt localoptions extendedglob
 	autoload -U modify-current-argument
-	modify-current-argument '$(readlink "$MARKPATH/$ARG")'
+	modify-current-argument '$(readlink "$MARKPATH/$ARG" || echo "$ARG")'
 }
 zle -N _mark_expansion
 bindkey "^g" _mark_expansion