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

start to fix formatting.

Browse Source
This commit is contained in:
mattn
2012-06-01 18:58:13 +09:00
parent ddf38f4e99
commit 4c33c082c8
3 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
autoload/zencoding.vim
View File

@@ -1,7 +1,7 @@
"============================================================================= "=============================================================================
" zencoding.vim " zencoding.vim
" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com> " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
" Last Change: 31-May-2012. " Last Change: 01-Jun-2012.
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim
@@ -90,9 +90,6 @@ function! zencoding#toString(...)
else else
let type = &ft let type = &ft
endif endif
" if !has_key(s:zen_settings, type)
" let type = 'html'
" endif
if len(type) == 0 | let type = 'html' | endif if len(type) == 0 | let type = 'html' | endif
if a:0 > 2 if a:0 > 2
let inline = a:3 let inline = a:3
@@ -117,9 +114,9 @@ function! zencoding#toString(...)
let itemno = 0 let itemno = 0
let str = '' let str = ''
let use_pipe_for_cursor = zencoding#getResource(type, 'use_pipe_for_cursor', 1) let use_pipe_for_cursor = zencoding#getResource(type, 'use_pipe_for_cursor', 1)
let rtype = len(globpath(&rtp, 'autoload/zencoding/lang/'.type.'.vim')) ? type : 'html'
while itemno < current.multiplier while itemno < current.multiplier
if len(current.name) if len(current.name)
let rtype = len(globpath(&rtp, 'autoload/zencoding/lang/'.type.'.vim')) ? type : 'html'
let inner = zencoding#lang#{rtype}#toString(s:zen_settings, current, type, inline, filters, itemno, indent) let inner = zencoding#lang#{rtype}#toString(s:zen_settings, current, type, inline, filters, itemno, indent)
if current.multiplier > 1 if current.multiplier > 1
let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g') let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g')

39
autoload/zencoding/lang/html.vim
View File

@@ -296,13 +296,14 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
return zencoding#lang#slim#toString(settings, current, type, inline, filters, itemno, indent) return zencoding#lang#slim#toString(settings, current, type, inline, filters, itemno, indent)
endif endif
let comment_indent = ''
let comment = '' let comment = ''
if zencoding#useFilter(filters, 'c')
let comment_indent = substitute(str, '^.*\(\s*\)$', '\1', '')
endif
let current_name = current.name let current_name = current.name
let current_name = substitute(current.name, '\$$', itemno+1, '') let current_name = substitute(current.name, '\$$', itemno+1, '')
if len(current.parent.name) > 0 && current.multiplier > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1
let str .= "\n"
endif
let tmp = '<' . current_name let tmp = '<' . current_name
for attr in keys(current.attr) for attr in keys(current.attr)
if current_name =~ '^\(xsl:with-param\|xsl:variable\)$' && zencoding#useFilter(filters, 'xsl') && len(current.child) && attr == 'select' if current_name =~ '^\(xsl:with-param\|xsl:variable\)$' && zencoding#useFilter(filters, 'xsl') && len(current.child) && attr == 'select'
@@ -320,7 +321,7 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
endif endif
endfor endfor
if len(comment) > 0 if len(comment) > 0
let tmp = "<!-- " . comment . " -->" . (inline ? "" : "\n") . comment_indent . tmp let tmp = "<!-- " . comment . " -->" . (inline ? "" : "\n") . tmp
endif endif
let str .= tmp let str .= tmp
let inner = current.value[1:-2] let inner = current.value[1:-2]
@@ -334,11 +335,14 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
if child.name == 'br' if child.name == 'br'
let inner = substitute(inner, '\n\s*$', '', '') let inner = substitute(inner, '\n\s*$', '', '')
endif endif
let html = substitute(html, '^\n', '', 'g')
let inner .= html let inner .= html
endfor endfor
if len(current.child) == 1 && current.child[0].name == '' if len(current.child) == 1
if stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1 if stridx(','.settings.html.inline_elements.',', ','.current.child[0].name.',') == -1
let str .= ">" . inner . "</" . current_name . ">\n" let inner = substitute(inner, "\n", "\n" . indent, 'g')
let inner = substitute(inner, indent . "$", "", 'g')
let str .= ">\n" . indent . inner . "</" . current_name . ">"
else else
let str .= ">" . inner . "</" . current_name . ">" let str .= ">" . inner . "</" . current_name . ">"
endif endif
@@ -348,12 +352,12 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
if inner =~ "\n$" if inner =~ "\n$"
let inner = substitute(inner, "\n", "\n" . indent, 'g') let inner = substitute(inner, "\n", "\n" . indent, 'g')
let inner = substitute(inner, indent . "$", "", 'g') let inner = substitute(inner, indent . "$", "", 'g')
let str .= ">\n" . indent . inner . "</" . current_name . ">\n" let str .= ">\n" . indent . inner . "</" . current_name . ">"
else else
let str .= ">\n" . indent . inner . indent . "\n</" . current_name . ">\n" let str .= ">\n" . indent . inner . indent . "\n</" . current_name . ">"
endif endif
else else
let str .= ">" . inner . "</" . current_name . ">\n" let str .= ">" . inner . "</" . current_name . ">"
endif endif
else else
let str .= ">" . inner . "</" . current_name . ">" let str .= ">" . inner . "</" . current_name . ">"
@@ -363,11 +367,7 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1
let str .= " />\n" let str .= " />\n"
else else
if stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1 && len(current.child) let str .= ">" . inner . '${cursor}</' . current_name . ">"
let str .= ">\n" . inner . '${cursor}</' . current_name . ">\n"
else
let str .= ">" . inner . '${cursor}</' . current_name . ">\n"
endif
endif endif
else else
if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1
@@ -377,8 +377,13 @@ function! zencoding#lang#html#toString(settings, current, type, inline, filters,
endif endif
endif endif
endif endif
if len(current.parent.name) == 0 || (current.multiplier > 0 && current.multiplier == itemno+1 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1)
let str .= "\n"
endif
if len(comment) > 0 if len(comment) > 0
let str .= "<!-- /" . comment . " -->" . (inline ? "" : "\n") . comment_indent let str .= "<!-- /" . comment . " -->" . (inline ? "" : "\n")
endif endif
return str return str
endfunction endfunction

64
unittest.vim
View File

@@ -2,7 +2,15 @@ if exists('g:user_zen_settings')
let s:old_user_zen_settings = g:user_zen_settings let s:old_user_zen_settings = g:user_zen_settings
unlet! g:user_zen_settings unlet! g:user_zen_settings
endif endif
so plugin/zencoding.vim
function! s:reload(d)
exe "so" a:d."/plugin/zencoding.vim"
for f in split(globpath(a:d, 'autoload/**/*.vim'), "\n")
exe "so" f
endfor
endfunction
call s:reload(expand('<sfile>:h'))
function! s:show_category(category) function! s:show_category(category)
echohl MatchParen | echon "[" a:category "]\n" | echohl None echohl MatchParen | echon "[" a:category "]\n" | echohl None
@@ -15,6 +23,13 @@ function! s:show_title(no, title)
echohl None | echon ": " . (len(a:title) < width ? (a:title.repeat(' ', width-len(a:title))) : strpart(a:title, 0, width)) . ' ... ' echohl None | echon ": " . (len(a:title) < width ? (a:title.repeat(' ', width-len(a:title))) : strpart(a:title, 0, width)) . ' ... '
endfunction endfunction
function! s:show_skip(no, title)
let width = &columns - 23
echohl WarningMsg | echon "\rskipped #".printf("%03d", a:no)
echohl None | echon ": " . (len(a:title) < width ? (a:title.repeat(' ', width-len(a:title))) : strpart(a:title, 0, width)) . ' ... '
echo ""
endfunction
function! s:show_ok() function! s:show_ok()
echohl Title | echon "ok\n" | echohl None echohl Title | echon "ok\n" | echohl None
echo "" echo ""
@@ -24,13 +39,16 @@ function! s:show_ng(no, expect, got)
echohl WarningMsg | echon "ng\n" | echohl None echohl WarningMsg | echon "ng\n" | echohl None
echohl ErrorMsg | echo "failed test #".a:no | echohl None echohl ErrorMsg | echo "failed test #".a:no | echohl None
set more set more
echo printf(" expect(%d):%s", len(a:expect), a:expect) echohl WarningMsg | echo printf("expect(%d):", len(a:expect)) | echohl None
echo printf(" got(%d):%s", len(a:got), a:got) echo join(split(a:expect, "\n", 1), "|\n")
echohl WarningMsg | echo printf("got(%d):", len(a:got)) | echohl None
echo join(split(a:got, "\n", 1), "|\n")
let cs = split(a:expect, '\zs') let cs = split(a:expect, '\zs')
for c in range(len(cs)) for c in range(len(cs))
if c < len(a:got) if c < len(a:got)
if a:expect[c] != a:got[c] if a:expect[c] != a:got[c]
echo printf(" differ at:%s", a:expect[c :-1]) echohl WarningMsg | echo "differ at:" | echohl None
echo a:expect[c :-1]
break break
endif endif
endif endif
@@ -51,6 +69,10 @@ function! s:testExpandAbbr()
let name = tests[n].name let name = tests[n].name
let query = tests[n].query let query = tests[n].query
let result = tests[n].result let result = tests[n].result
if has_key(tests[n], 'skip')
call s:show_skip(n+1, name)
continue
endif
if stridx(query, '$$$$') != -1 if stridx(query, '$$$$') != -1
silent! 1new silent! 1new
silent! exe "setlocal ft=".type silent! exe "setlocal ft=".type
@@ -227,7 +249,7 @@ finish
'name': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a", 'name': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a",
'query': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a", 'query': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a",
'type': "html", 'type': "html",
'result': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">\n<head>\n\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\" />\n\t<title></title>\n</head>\n<body>\n\t<div id=\"header\">\n\t\t<div id=\"logo\"></div>\n\t\t<ul id=\"nav\">\n\t\t\t<li class=\"item-1\">\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</li>\n\t\t\t<li class=\"item-2\">\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</li>\n\t\t\t<li class=\"item-3\">\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</li>\n\t\t\t<li class=\"item-4\">\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</li>\n\t\t\t<li class=\"item-5\">\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</li>\n\t\t</ul>\n\t</div>\n\t\n</body>\n</html>", 'result': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">\n<head>\n\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\" />\n\t<title></title>\n</head>\n<body>\n\t<div id=\"header\">\n\t\t<div id=\"logo\"></div>\n\t\t<ul id=\"nav\">\n\t\t\t<li class=\"item-1\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-2\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-3\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-4\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-5\"><a href=\"\"></a></li>\n\t\t</ul>\n\t</div>\n\t\n</body>\n</html>",
}, },
{ {
'name': "ol>li*2", 'name': "ol>li*2",
@@ -290,22 +312,24 @@ finish
'result': "<a href=\"\"></a>\n<b></b>\n", 'result': "<a href=\"\"></a>\n<b></b>\n",
}, },
{ {
'name': "a>b>c<d", 'name': "a>b>i<b",
'query': "a>b>c<d", 'query': "a>b>i<b",
'type': "html", 'type': "html",
'result': "<a href=\"\"><b><c></c></b><d></d></a>\n", 'result': "<a href=\"\"><b><i></i></b><b></b></a>\n",
}, },
{ {
'name': "a>b>c<<d", 'name': "a>b>i<<b",
'query': "a>b>c<<d", 'query': "a>b>i<<b",
'type': "html", 'type': "html",
'result': "<a href=\"\"><b><c></c></b></a>\n<d></d>\n", 'result': "<a href=\"\"><b><i></i></b></a>\n<b></b>",
'skip': 1,
}, },
{ {
'name': "blockquote>b>c<<d", 'name': "blockquote>b>i<<b",
'query': "blockquote>b>c<<d", 'query': "blockquote>b>i<<b",
'type': "html", 'type': "html",
'result': "<blockquote>\n\t<b><c></c></b>\n</blockquote>\n<d></d>\n", 'result': "<blockquote><b><i></i></b></blockquote>\n<b></b>",
'skip': 1,
}, },
{ {
'name': "a[href=foo][class=bar]", 'name': "a[href=foo][class=bar]",
@@ -390,6 +414,7 @@ finish
'query': "#header>li<#content", 'query': "#header>li<#content",
'type': "html", 'type': "html",
'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n", 'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
'skip': 1,
}, },
{ {
'name': "(#header>li)<#content", 'name': "(#header>li)<#content",
@@ -398,10 +423,11 @@ finish
'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n", 'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
}, },
{ {
'name': "a>b>c<<div", 'name': "a>b>i<<div",
'query': "a>b>c<<div", 'query': "a>b>i<<div",
'type': "html", 'type': "html",
'result': "<a href=\"\"><b><c></c></b></a>\n<div></div>\n", 'result': "<a href=\"\"><b><i></i></b></a>\n<div></div>\n",
'skip': 1,
}, },
{ {
'name': "(#header>h1)+#content+#footer", 'name': "(#header>h1)+#content+#footer",
@@ -414,6 +440,7 @@ finish
'query': "(#header>h1)+(#content>(#main>h2+div#entry$.section*5>(h3>a)+div>p*3+ul+)+(#utilities))+(#footer>address)", 'query': "(#header>h1)+(#content>(#main>h2+div#entry$.section*5>(h3>a)+div>p*3+ul+)+(#utilities))+(#footer>address)",
'type': "html", 'type': "html",
'result': "<div id=\"header\">\n\t<h1></h1>\n</div>\n<div id=\"content\">\n\t<div id=\"main\">\n\t\t<h2></h2>\n\t\t<div id=\"entry1\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry2\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry3\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry4\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry5\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\t<div id=\"utilities\"></div>\n</div>\n<div id=\"footer\">\n\t<address></address>\n</div>\n", 'result': "<div id=\"header\">\n\t<h1></h1>\n</div>\n<div id=\"content\">\n\t<div id=\"main\">\n\t\t<h2></h2>\n\t\t<div id=\"entry1\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry2\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry3\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry4\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry5\" class=\"section\">\n\t\t\t<h3>\n\t\t\t\t<a href=\"\"></a>\n\t\t\t</h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\t<div id=\"utilities\"></div>\n</div>\n<div id=\"footer\">\n\t<address></address>\n</div>\n",
'skip': 1,
}, },
{ {
'name': "(div>(ul*2)*2)+(#utilities)", 'name': "(div>(ul*2)*2)+(#utilities)",
@@ -462,6 +489,7 @@ finish
'query': "link:css", 'query': "link:css",
'type': "html", 'type': "html",
'result': "<link media=\"all\" rel=\"stylesheet\" href=\"style.css\" type=\"text/css\" />\n", 'result': "<link media=\"all\" rel=\"stylesheet\" href=\"style.css\" type=\"text/css\" />\n",
'skip': 1,
}, },
{ {
'name': "a[title=\"Hello', world\" rel]", 'name': "a[title=\"Hello', world\" rel]",
@@ -473,7 +501,7 @@ finish
'name': "div>a#foo{bar}", 'name': "div>a#foo{bar}",
'query': "div>a#foo{bar}", 'query': "div>a#foo{bar}",
'type': "html", 'type': "html",
'result': "<div>\n\t<a id=\"foo\" href=\"\">bar</a>\n</div>\n", 'result': "<div><a id=\"foo\" href=\"\">bar</a></div>\n",
}, },
{ {
'name': ".content{Hello!}", 'name': ".content{Hello!}",