VimPlug/delimitMate
1
0
Fork 0
mirror of https://github.com/Raimondi/delimitMate.git synced 2025-12-06 12:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consider popup menu when expanding. Close #154.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2013-12-24 13:20:39 -05:00
parent 5ef40e0234
commit 821e0019fb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/delimitMate.vim
View File

@@ -471,12 +471,13 @@ function! delimitMate#ExpandReturn() "{{{
endif
let escaped = delimitMate#CursorIdx() >= 2
\ && delimitMate#GetCharFromCursor(-2) == '\'
if delimitMate#WithinEmptyMatchpair()
if !pumvisible() && (
\ delimitMate#WithinEmptyMatchpair()
\ || (s:g('expand_cr') == 2
\ && index(s:g('right_delims'), delimitMate#GetCharFromCursor(0)) > -1)
\ || (s:g('expand_inside_quotes')
\ && delimitMate#WithinEmptyQuotes()
\ && !escaped)
\ && !escaped))
" Expand:
" XXX zv prevents breaking expansion with syntax folding enabled by
" InsertLeave.