Merge pull request #454 from zsh-users/develop

v0.6.3

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.6.3
+- Fixed bug moving cursor to end of buffer after accepting suggestion (#453)
+
 ## v0.6.2
 - Fixed bug deleting the last character in the buffer in vi mode (#450)
 - Degrade gracefully when user doesn't have `zsh/system` module installed (#447)

VERSION

@@ -1 +1 @@
-v0.6.2
+v0.6.3

spec/options/widget_lists_spec.rb

@@ -5,12 +5,13 @@ describe 'a zle widget' do
   context 'when added to ZSH_AUTOSUGGEST_ACCEPT_WIDGETS' do
     let(:options) { ["ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=(#{widget})"] }
 
-    it 'accepts the suggestion when invoked' do
+    it 'accepts the suggestion and moves the cursor to the end of the buffer when invoked' do
       with_history('echo hello') do
         session.send_string('e')
         wait_for { session.content }.to eq('echo hello')
         session.send_keys('C-b')
         wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
+        wait_for { session.cursor }.to eq([10, 0])
       end
     end
   end

src/strategies/historywords.zsh

@@ -1,28 +0,0 @@
-
-#--------------------------------------------------------------------#
-# History Words Suggestion Strategy                                  #
-#--------------------------------------------------------------------#
-# Suggests the most recent history word that matches the given
-# prefix.
-#
-
-_zsh_autosuggest_strategy_historywords() {
-	# Reset options to defaults and enable LOCAL_OPTIONS
-	emulate -L zsh
-
-	# Enable globbing flags so that we can use (#m)
-	setopt EXTENDED_GLOB
-
-	local last_word="${${=1}[-1]}"
-
-	# Escape backslashes and all of the glob operators so we can use
-	# this string as a pattern to search the $history associative array.
-	# - (#m) globbing flag enables setting references for match data
-	# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
-	local prefix="${last_word//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
-
-	# Get the first history word that matches. Concatenate it together with the
-	# prefix to form the full suggestion.
-	# - (r) subscript flag makes the pattern match on values
-	typeset -g suggestion="${1:0:-$#last_word}${historywords[(r)${prefix}?*]}"
-}

src/widgets.zsh

@@ -136,7 +136,11 @@ _zsh_autosuggest_accept() {
 		unset POSTDISPLAY
 
 		# Move the cursor to the end of the buffer
-		CURSOR=${max_cursor_pos}
+		if [[ "$KEYMAP" = "vicmd" ]]; then
+			CURSOR=$(($#BUFFER - 1))
+		else
+			CURSOR=$#BUFFER
+		fi
 	fi
 
 	_zsh_autosuggest_invoke_original_widget $@

zsh-autosuggestions.zsh

@@ -1,6 +1,6 @@
 # Fish-like fast/unobtrusive autosuggestions for zsh.
 # https://github.com/zsh-users/zsh-autosuggestions
-# v0.6.2
+# v0.6.3
 # Copyright (c) 2013 Thiago de Arruda
 # Copyright (c) 2016-2019 Eric Freese
 # 
@@ -398,7 +398,11 @@ _zsh_autosuggest_accept() {
 		unset POSTDISPLAY
 
 		# Move the cursor to the end of the buffer
-		CURSOR=${max_cursor_pos}
+		if [[ "$KEYMAP" = "vicmd" ]]; then
+			CURSOR=$(($#BUFFER - 1))
+		else
+			CURSOR=$#BUFFER
+		fi
 	fi
 
 	_zsh_autosuggest_invoke_original_widget $@
@@ -611,34 +615,6 @@ _zsh_autosuggest_strategy_completion() {
 	}
 }
 
-#--------------------------------------------------------------------#
-# History Words Suggestion Strategy                                  #
-#--------------------------------------------------------------------#
-# Suggests the most recent history word that matches the given
-# prefix.
-#
-
-_zsh_autosuggest_strategy_historywords() {
-	# Reset options to defaults and enable LOCAL_OPTIONS
-	emulate -L zsh
-
-	# Enable globbing flags so that we can use (#m)
-	setopt EXTENDED_GLOB
-
-	local last_word="${${=1}[-1]}"
-
-	# Escape backslashes and all of the glob operators so we can use
-	# this string as a pattern to search the $history associative array.
-	# - (#m) globbing flag enables setting references for match data
-	# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
-	local prefix="${last_word//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
-
-	# Get the first history word that matches. Concatenate it together with the
-	# prefix to form the full suggestion.
-	# - (r) subscript flag makes the pattern match on values
-	typeset -g suggestion="${1:0:-$#last_word}${historywords[(r)${prefix}?*]}"
-}
-
 #--------------------------------------------------------------------#
 # History Suggestion Strategy                                        #
 #--------------------------------------------------------------------#