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

exapnd $# of attribute in block element. close #282

Browse Source
This commit is contained in:
mattn
2015-07-25 10:49:40 +09:00
parent af10f14ae5
commit f36d6f4025
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/emmet.vim
View File

@@ -475,7 +475,7 @@ function! emmet#expandAbbr(mode, abbr) range abort
endif endif
if leader =~# '\*' if leader =~# '\*'
let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '') let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '')
if query !~# '}\s*$' if query !~# '}\s*$' && query !~# '\$#'
let query .= '>{$#}' let query .= '>{$#}'
endif endif
if emmet#useFilter(filters, '/') if emmet#useFilter(filters, '/')

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

@@ -487,8 +487,10 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
endif endif
let text = substitute(text, '\${nr}', "\n", 'g') let text = substitute(text, '\${nr}', "\n", 'g')
let text = substitute(text, '\\\$', '$', 'g') let text = substitute(text, '\\\$', '$', 'g')
if text != ''
let str = substitute(str, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', text, 'g') let str = substitute(str, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', text, 'g')
endif endif
endif
let str .= text let str .= text
let nc = len(current.child) let nc = len(current.child)
let dr = 0 let dr = 0

4
unittest.vim
View File

@@ -491,6 +491,10 @@ finish
'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,input[type=input value=$#]*\\<cr>$$$$", 'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,input[type=input value=$#]*\\<cr>$$$$",
'result': "<input type=\"input\" value=\"test1\">\n<input type=\"input\" value=\"test2\">\n<input type=\"input\" value=\"test3\">", 'result': "<input type=\"input\" value=\"test1\">\n<input type=\"input\" value=\"test2\">\n<input type=\"input\" value=\"test3\">",
}, },
{
'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,div[id=$#]*\\<cr>$$$$",
'result': "<div id=\"test1\"></div>\n<div id=\"test2\"></div>\n<div id=\"test3\"></div>",
},
{ {
'query': "div#id-$*5>div#id2-$", 'query': "div#id-$*5>div#id2-$",
'result': "<div id=\"id-1\">\n\t<div id=\"id2-1\"></div>\n</div>\n<div id=\"id-2\">\n\t<div id=\"id2-2\"></div>\n</div>\n<div id=\"id-3\">\n\t<div id=\"id2-3\"></div>\n</div>\n<div id=\"id-4\">\n\t<div id=\"id2-4\"></div>\n</div>\n<div id=\"id-5\">\n\t<div id=\"id2-5\"></div>\n</div>\n", 'result': "<div id=\"id-1\">\n\t<div id=\"id2-1\"></div>\n</div>\n<div id=\"id-2\">\n\t<div id=\"id2-2\"></div>\n</div>\n<div id=\"id-3\">\n\t<div id=\"id2-3\"></div>\n</div>\n<div id=\"id-4\">\n\t<div id=\"id2-4\"></div>\n</div>\n<div id=\"id-5\">\n\t<div id=\"id2-5\"></div>\n</div>\n",