Consider issue #39

kovisoft · Mar 2, 2024 · 139bb89 · 139bb89
1 parent 92f91aa
commit 139bb89
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/plugin/paredit.vim b/plugin/paredit.vim
@@ -1119,9 +1119,15 @@ endfunction
 
 " Handle <Enter> keypress, insert electric return if applicable
 function! PareditEnter()
-    if pumvisible() && &completeopt !~# 'longest\|noinsert\|noselect'
-        " Pressing <CR> in a pop up selects entry.
-        return "\<C-Y>"
+    if pumvisible()
+        let lastchar = getline('.')[col('.')-2]
+        if stridx(')]}', lastchar) >= 0
+            " Select entry and add closing bracket (which vim removes)
+            return "\<C-Y>" . lastchar . "\<Left>"
+        else
+            " Pressing <CR> in a pop up selects entry.
+            return "\<C-Y>"
+        endif
     else
         let line = getline( '.' )
         let pos = col( '.' ) - 1