VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-10 04:21:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix comment block.

Browse Source
This commit is contained in:
mattn
2010-03-05 23:01:32 +09:00
parent cb0a48ea32
commit ed98e0faa5
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
zencoding.vim
View File

@@ -1281,24 +1281,39 @@ endfunction
function! s:zen_toggleComment() function! s:zen_toggleComment()
let pos = getpos('.') let pos = getpos('.')
let tag_region = s:search_region('<[a-zA-Z][a-zA-Z0-9][^>\s]\+>', '\(<\/[^>]\+>\|[^\-]>\)') let block = s:search_region('<[a-zA-Z][a-zA-Z0-9]*[^\/>]*>', '\(<\/[^>]\+>\)')
if !s:cursor_in_region(tag_region) if !s:cursor_in_region(block)
return let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>\s]*'
endif let mx2 = '[^/>\s]*/>'
let empty = s:search_region(mx1, mx2)
if !s:cursor_in_region(block)
let comment_region = s:search_region('<!--', '-->') let comment_region = s:search_region('<!--', '-->')
if !s:region_is_valid(comment_region) || !s:cursor_in_region(comment_region) if !s:region_is_valid(comment_region) || !s:cursor_in_region(comment_region)
let content = '<!-- ' . s:get_content(tag_region) . ' -->' let content = '<!-- ' . s:get_content(empty) . ' -->'
call s:change_content(tag_region, content) call s:change_content(empty, content)
else else
let content = s:get_content(comment_region) let content = s:get_content(comment_region)
let content = substitute(content, '^<!--\s\(.*\)\s-->$', '\1', '') let content = substitute(content, '^<!--\s\(.*\)\s-->$', '\1', '')
call s:change_content(comment_region, content) call s:change_content(comment_region, content)
endif endif
endif
return
else
let comment_region = s:search_region('<!--', '-->')
if !s:region_is_valid(comment_region) || !s:cursor_in_region(comment_region)
let content = '<!-- ' . s:get_content(block) . ' -->'
call s:change_content(block, content)
else
let content = s:get_content(comment_region)
let content = substitute(content, '^<!--\s\(.*\)\s-->$', '\1', '')
call s:change_content(comment_region, content)
endif
endif
call setpos('.', pos) call setpos('.', pos)
endfunction endfunction
function! s:zen_splitJoinTag() function! s:zen_splitJoinTag()
let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>\s]*>' let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>]*>'
let mx2 = '<\/[^>]\+>' let mx2 = '<\/[^>]\+>'
let block = s:search_region(mx1, mx2) let block = s:search_region(mx1, mx2)
if s:cursor_in_region(block) if s:cursor_in_region(block)