diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 52eaa01..0985aa3 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -1,7 +1,7 @@ "============================================================================= " emmet.vim " Author: Yasuhiro Matsumoto -" Last Change: 26-Nov-2013. +" Last Change: 28-Nov-2013. let s:save_cpo = &cpo set cpo&vim @@ -452,7 +452,6 @@ function! emmet#expandAbbr(mode, abbr) range let line = '' let part = '' let rest = '' - let ret = pumvisible() ? "" : "\" let filters = emmet#getFilters(type) if len(filters) == 0 @@ -462,7 +461,7 @@ function! emmet#expandAbbr(mode, abbr) range if a:mode == 2 let leader = substitute(input('Tag: ', ''), '^\s*\(.*\)\s*$', '\1', 'g') if len(leader) == 0 - return ret + return '' endif let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$' if leader =~ mx @@ -554,7 +553,7 @@ function! emmet#expandAbbr(mode, abbr) range endif normal! $ call emmet#expandAbbr(0, "") - return ret + return '' else let line = getline('.') if col('.') < len(line) @@ -651,7 +650,7 @@ function! emmet#expandAbbr(mode, abbr) range if g:emmet_debug > 1 call getchar() endif - return ret + return '' endfunction function! emmet#moveNextPrevItem(flag) @@ -672,7 +671,7 @@ function! emmet#imageSize() let rtype = emmet#lang#exists(type) ? type : 'html' call emmet#lang#{rtype}#imageSize() silent! call setpos('.', orgpos) - return pumvisible() ? "" : "\" + return '' endfunction function! emmet#encodeImage() @@ -685,7 +684,7 @@ function! emmet#toggleComment() let type = emmet#getFileType() let rtype = emmet#lang#exists(type) ? type : 'html' call emmet#lang#{rtype}#toggleComment() - return pumvisible() ? "" : "" + return '' endfunction function! emmet#balanceTag(flag) range @@ -711,7 +710,7 @@ function! emmet#removeTag() let type = emmet#getFileType() let rtype = emmet#lang#exists(type) ? type : 'html' call emmet#lang#{rtype}#removeTag() - return pumvisible() ? "" : "" + return '' endfunction function! emmet#anchorizeURL(flag) @@ -720,7 +719,7 @@ function! emmet#anchorizeURL(flag) let url = matchstr(getline(pos1[0])[pos1[1]-1:], mx) let block = [pos1, [pos1[0], pos1[1] + len(url) - 1]] if !emmet#util#cursorInRegion(block) - return pumvisible() ? "" : "\" + return '' endif let mx = '.*]*>\s*\zs\([^<]\+\)\ze\s*<\/title[^>]*>.*' @@ -760,7 +759,7 @@ function! emmet#anchorizeURL(flag) let indent = substitute(getline('.'), '^\(\s*\).*', '\1', '') let expand = substitute(expand, "\n", "\n" . indent, 'g') call emmet#util#setContent(block, expand) - return pumvisible() ? "" : "\" + return '' endfunction function! emmet#codePretty() range diff --git a/autoload/emmet/util.vim b/autoload/emmet/util.vim index 7d272bd..80d90ae 100644 --- a/autoload/emmet/util.vim +++ b/autoload/emmet/util.vim @@ -324,3 +324,7 @@ function! emmet#util#getcurpos() endif return pos endfunction + +function! emmet#closePopup() + return pumvisible() ? "\" : "" +endfunction diff --git a/plugin/emmet.vim b/plugin/emmet.vim index 43e7c48..5be6a89 100644 --- a/plugin/emmet.vim +++ b/plugin/emmet.vim @@ -1,7 +1,7 @@ "============================================================================= " File: emmet.vim " Author: Yasuhiro Matsumoto -" Last Change: 26-Nov-2013. +" Last Change: 28-Nov-2013. " Version: 0.83 " WebPage: http://github.com/mattn/emmet-vim " Description: vim plugins for HTML and CSS hi-speed coding. @@ -101,10 +101,10 @@ endif function! s:install_plugin(mode, buffer) let buffer = a:buffer ? '' : '' for item in [ - \ {'mode': 'i', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': '=emmet#expandAbbr(0,"")'}, + \ {'mode': 'i', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': '=emmet#util#closePopup()=emmet#expandAbbr(0,"")'}, \ {'mode': 'n', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': ':call emmet#expandAbbr(3,"")'}, \ {'mode': 'v', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': ':call emmet#expandAbbr(2,"")'}, - \ {'mode': 'i', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'EmmetExpandWord', 'func': '=emmet#expandAbbr(1,"")'}, + \ {'mode': 'i', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'EmmetExpandWord', 'func': '=emmet#util#closePopup()=emmet#expandAbbr(1,"")'}, \ {'mode': 'n', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'EmmetExpandWord', 'func': ':call emmet#expandAbbr(1,"")'}, \ {'mode': 'i', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'EmmetBalanceTagInward', 'func': ':call emmet#balanceTag(1)'}, \ {'mode': 'n', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'EmmetBalanceTagInward', 'func': ':call emmet#balanceTag(1)'}, @@ -116,17 +116,17 @@ function! s:install_plugin(mode, buffer) \ {'mode': 'n', 'var': 'user_emmet_next_key', 'key': 'n', 'plug': 'EmmetMoveNext', 'func': ':call emmet#moveNextPrev(0)'}, \ {'mode': 'i', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'EmmetMovePrev', 'func': ':call emmet#moveNextPrev(1)'}, \ {'mode': 'n', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'EmmetMovePrev', 'func': ':call emmet#moveNextPrev(1)'}, - \ {'mode': 'i', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'EmmetImageSize', 'func': '=emmet#imageSize()'}, + \ {'mode': 'i', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'EmmetImageSize', 'func': '=emmet#util#closePopup()=emmet#imageSize()'}, \ {'mode': 'n', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'EmmetImageSize', 'func': ':call emmet#imageSize()'}, - \ {'mode': 'i', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'EmmetToggleComment', 'func': '=emmet#toggleComment()'}, + \ {'mode': 'i', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'EmmetToggleComment', 'func': '=emmet#util#closePopup()=emmet#toggleComment()'}, \ {'mode': 'n', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'EmmetToggleComment', 'func': ':call emmet#toggleComment()'}, \ {'mode': 'i', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'EmmetSplitJoinTag', 'func': ':call emmet#splitJoinTag()'}, \ {'mode': 'n', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'EmmetSplitJoinTag', 'func': ':call emmet#splitJoinTag()'}, - \ {'mode': 'i', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'EmmetRemoveTag', 'func': '=emmet#removeTag()'}, + \ {'mode': 'i', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'EmmetRemoveTag', 'func': '=emmet#util#closePopup()=emmet#removeTag()'}, \ {'mode': 'n', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'EmmetRemoveTag', 'func': ':call emmet#removeTag()'}, - \ {'mode': 'i', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'EmmetAnchorizeURL', 'func': '=emmet#anchorizeURL(0)'}, + \ {'mode': 'i', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'EmmetAnchorizeURL', 'func': '=emmet#util#closePopup()=emmet#anchorizeURL(0)'}, \ {'mode': 'n', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'EmmetAnchorizeURL', 'func': ':call emmet#anchorizeURL(0)'}, - \ {'mode': 'i', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'EmmetAnchorizeSummary', 'func': '=emmet#anchorizeURL(1)'}, + \ {'mode': 'i', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'EmmetAnchorizeSummary', 'func': '=emmet#util#closePopup()=emmet#anchorizeURL(1)'}, \ {'mode': 'n', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'EmmetAnchorizeSummary', 'func': ':call emmet#anchorizeURL(1)'}, \ {'mode': 'v', 'var': 'user_emmet_mergelines_key', 'key': 'm', 'plug': 'EmmetMergeLines', 'func': ':call emmet#mergeLines()'}, \ {'mode': 'v', 'var': 'user_emmet_codepretty_key', 'key': 'c', 'plug': 'EmmetCodePretty', 'func': ':call emmet#codePretty()'},