VimPlug/emmet-vim
1
0
Fork 1
mirror of https://github.com/mattn/emmet-vim.git synced 2025-12-06 18:54:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix balance tag

Browse Source
This commit is contained in:
mattn
2014-04-14 09:19:26 +09:00
parent 74055488de
commit 2b6f37f470
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
autoload/emmet/lang/html.vim
View File

@@ -665,7 +665,8 @@ function! emmet#lang#html#balanceTag(flag) range
let settings = emmet#getSettings() let settings = emmet#getSettings()
if a:flag > 0 if a:flag > 0
let mx = '<\([a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*>' let mx = '<\([a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*'
let last = curpos[1:2]
while 1 while 1
let pos1 = searchpos(mx, 'bW') let pos1 = searchpos(mx, 'bW')
let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx) let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
@@ -673,16 +674,20 @@ function! emmet#lang#html#balanceTag(flag) range
if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1 if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1
let pos2 = searchpos('>', 'nW') let pos2 = searchpos('>', 'nW')
else else
let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '>\zs', 'nW') let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '\zs>', 'nW')
endif endif
let block = [pos1, pos2] let block = [pos1, pos2]
if pos1[0] == 0 && pos1[1] == 0 if pos1[0] == 0 && pos1[1] == 0
break break
endif endif
if emmet#util#pointInRegion(curpos[1:2], block) && emmet#util#regionIsValid(block) if emmet#util#pointInRegion(last, block) && emmet#util#regionIsValid(block)
call emmet#util#selectRegion(block) call emmet#util#selectRegion(block)
return return
endif endif
if pos1 == last
break
endif
let last = pos1
endwhile endwhile
else else
let mx = '<\([a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*>' let mx = '<\([a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*>'
@@ -702,7 +707,7 @@ function! emmet#lang#html#balanceTag(flag) range
if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1 if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1
let pos2 = searchpos('>', 'nW') let pos2 = searchpos('>', 'nW')
else else
let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '>\zs', 'nW') let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '\zs>', 'nW')
endif endif
let block = [pos1, pos2] let block = [pos1, pos2]
if pos1[0] == 0 && pos1[1] == 0 if pos1[0] == 0 && pos1[1] == 0