VimPlug/emmet-vim-fork
1
0
Fork 0
forked from VimPlug/emmet-vim
Code Pull Requests Activity

fix several bugs.

Browse Source
This commit is contained in:
mattn
2010-03-06 02:06:23 +09:00
parent ed98e0faa5
commit 729634a1b4
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
zencoding.vim
View File

@@ -1,7 +1,7 @@
"============================================================================= "=============================================================================
" File: zencoding.vim " File: zencoding.vim
" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com> " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
" Last Change: 05-Mar-2010. " Last Change: 06-Mar-2010.
" Version: 0.27 " Version: 0.27
" WebPage: http://github.com/mattn/zencoding-vim " WebPage: http://github.com/mattn/zencoding-vim
" Description: vim plugins for HTML and CSS hi-speed coding. " Description: vim plugins for HTML and CSS hi-speed coding.
@@ -1313,28 +1313,30 @@ function! s:zen_toggleComment()
endfunction endfunction
function! s:zen_splitJoinTag() function! s:zen_splitJoinTag()
let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>]*>' let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>]*'
let mx2 = '<\/[^>]\+>' let mx2 = '/>'
let block = s:search_region(mx1, mx2) let empty = s:search_region(mx1, mx2)
if s:cursor_in_region(block) if s:cursor_in_region(empty)
let content = s:get_content(block) let content = s:get_content(empty)
let content = matchstr(content, mx1)[:-2] . '/>' let tag_name = substitute(content, '^<\([a-zA-Z0-9]*\).*$', '\1', '')
call s:change_content(block, content) let content = matchstr(content, mx1) . ">\n</" . tag_name . '>'
call s:change_content(empty, content)
call setpos('.', [0, empty[0][0], empty[0][1], 0])
else else
let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>\s]*' let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>]*>'
let mx2 = '[^/>\s]*/>' let mx2 = '<\/[^>]\+>'
let empty = s:search_region(mx1, mx2) let block = s:search_region(mx1, mx2)
if s:cursor_in_region(empty) if s:cursor_in_region(block)
let content = s:get_content(empty) let content = s:get_content(block)
let tag_name = substitute(content, '^<\([a-zA-Z0-9]*\).*$', '\1', '') let content = matchstr(content, mx1)[:-2] . '/>'
let content = matchstr(content, mx1) . ">\n</" . tag_name . '>' call s:change_content(block, content)
call s:change_content(empty, content) call setpos('.', [0, block[0][0], block[0][1], 0])
endif endif
endif endif
endfunction endfunction
function! s:zen_removeTag() function! s:zen_removeTag()
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)
@@ -1342,13 +1344,15 @@ function! s:zen_removeTag()
let tag_name = substitute(content, '^<\([a-zA-Z0-9]*\).*$', '\1', '') let tag_name = substitute(content, '^<\([a-zA-Z0-9]*\).*$', '\1', '')
if matchstr(content, mx2) =~ '</' . tag_name if matchstr(content, mx2) =~ '</' . tag_name
call s:change_content(block, '') call s:change_content(block, '')
call setpos('.', [0, block[0][0], block[0][1], 0])
endif endif
else else
let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>\s]*' let mx1 = '<[a-zA-Z][a-zA-Z0-9]*[^/>]*'
let mx2 = '[^/>\s]*/>' let mx2 = '/>'
let empty = s:search_region(mx1, mx2) let empty = s:search_region(mx1, mx2)
if s:cursor_in_region(empty) if s:cursor_in_region(empty)
call s:change_content(empty, '') call s:change_content(empty, '')
call setpos('.', [0, empty[0][0], empty[0][1], 0])
endif endif
endif endif
endfunction endfunction
@@ -1460,14 +1464,14 @@ endfunction
" baz:end " baz:end
" -------------------- " --------------------
function! s:change_content(region, content) function! s:change_content(region, content)
let oldlines = getline(a:region[0][0], a:region[1][0])
let newlines = split(a:content, '\n') let newlines = split(a:content, '\n')
let oldlines = getline(a:region[0][0], a:region[1][0])
call setpos('.', [0, a:region[0][0], a:region[0][1], 0]) call setpos('.', [0, a:region[0][0], a:region[0][1], 0])
silent! exe "delete ".(a:region[1][0] - a:region[0][0]) silent! exe "delete ".(a:region[1][0] - a:region[0][0])
if len(newlines) == 0 if len(newlines) == 0
let tmp = '' let tmp = ''
if a:region[0][1] > 0 if a:region[0][1] > 0
let tmp = oldlines[0][a:region[0][1]-2] let tmp = oldlines[0][:a:region[0][1]-2]
endif endif
if a:region[1][1] > 0 if a:region[1][1] > 0
let tmp .= oldlines[-1][a:region[1][1]:] let tmp .= oldlines[-1][a:region[1][1]:]
@@ -1475,14 +1479,14 @@ function! s:change_content(region, content)
call setline(line('.'), tmp) call setline(line('.'), tmp)
elseif len(newlines) == 1 elseif len(newlines) == 1
if a:region[0][1] > 0 if a:region[0][1] > 0
let newlines[0] = oldlines[0][a:region[0][1]-2] . newlines[0] let newlines[0] = oldlines[0][:a:region[0][1]-2] . newlines[0]
endif endif
if a:region[1][1] > 0 if a:region[1][1] > 0
let newlines[0] .= oldlines[-1][a:region[1][1]:] let newlines[0] .= oldlines[-1][a:region[1][1]:]
endif endif
call setline(line('.'), newlines[0]) call setline(line('.'), newlines[0])
else else
let newlines[0] = oldlines[0][a:region[0][1]-2] . newlines[0] let newlines[0] = oldlines[0][:a:region[0][1]-2] . newlines[0]
let newlines[-1] .= oldlines[-1][a:region[1][1]] let newlines[-1] .= oldlines[-1][a:region[1][1]]
call setline(line('.'), newlines[0]) call setline(line('.'), newlines[0])
call append(line('.'), newlines[1:]) call append(line('.'), newlines[1:])
@@ -1545,7 +1549,7 @@ endfunction
" region_in_region : check region is in the region " region_in_region : check region is in the region
" this function return 0 or 1 " this function return 0 or 1
function! s:region_in_region(outer, inner) function! s:region_in_region(outer, inner)
if !s:region_is_valid(region) if !s:region_is_valid(a:inner) || !s:region_is_valid(a:outer) ||
return 0 return 0
endif endif
return s:point_in_region(a:inner[0], a:outer) && s:point_in_region(a:inner[1], a:outer) return s:point_in_region(a:inner[0], a:outer) && s:point_in_region(a:inner[1], a:outer)