fix(expand and accept): respect trailing whitespace

olets · olets · commit f0275653a935 · 2020-03-07T16:38:38.000-05:00
diff --git a/zsh-abbr.zsh b/zsh-abbr.zsh
@@ -840,7 +840,13 @@ _zsh_abbr_cmd_expansion() {
 }
 
 _zsh_abbr_expand_and_accept() {
-  zle _zsh_abbr_expand_widget
+  local trailing_space
+  trailing_space=${LBUFFER##*[^[:IFSSPACE:]]}
+
+  if [[ -z $trailing_space ]]; then
+    zle _zsh_abbr_expand_widget
+  fi
+
   zle accept-line
 }
 

Original file line number	Diff line number	Diff line change
`@@ -840,7 +840,13 @@ _zsh_abbr_cmd_expansion() {`
`840`	`840`	`}`
`841`	`841`
`842`	`842`	`_zsh_abbr_expand_and_accept() {`
`843`		`- zle _zsh_abbr_expand_widget`
	`843`	`+ local trailing_space`
	`844`	`+ trailing_space=${LBUFFER##*[^[:IFSSPACE:]]}`
	`845`	`+`
	`846`	`+ if [[ -z $trailing_space ]]; then`
	`847`	`+ zle _zsh_abbr_expand_widget`
	`848`	`+ fi`
	`849`	`+`
`844`	`850`	`zle accept-line`
`845`	`851`	`}`
`846`	`852`