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

large change. changed cursor mark to '${cursor}'.

Browse Source
This commit is contained in:
mattn
2010-03-08 22:45:53 +09:00
parent 33d049492b
commit 0e21c19f6f
2 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest.vim
View File

@@ -186,7 +186,7 @@ finish
'name': "a#foo$$$*3", 'name': "a#foo$$$*3",
'query': "a#foo$$$*3", 'query': "a#foo$$$*3",
'type': "html", 'type': "html",
'result': "<a id=\"foo111\" href=\"\"></a>\n<a id=\"foo222\" href=\"\"></a>\n<a id=\"foo333\" href=\"\"></a>\n", 'result': "<a id=\"foo001\" href=\"\"></a>\n<a id=\"foo002\" href=\"\"></a>\n<a id=\"foo003\" href=\"\"></a>\n",
}, },
{ {
'name': "ul+", 'name': "ul+",
@@ -298,7 +298,7 @@ finish
'name': "ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}+br", 'name': "ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}+br",
'query': "ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}+br", 'query': "ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}+br",
'type': "haml", 'type': "haml",
'result': "%ul#foo\n %li.bar1{ :foo => \"bar\", :bar => \"baz\" }\n baz\n %br/\n %li.bar2{ :foo => \"bar\", :bar => \"baz\" }\n baz\n %br/\n %li.bar3{ :foo => \"bar\", :bar => \"baz\" }\n baz\n %br/\n", 'result': "%ul#foo\n %li.bar1{ :foo => \"bar\", :bar => \"baz\" } baz\n %br/\n %li.bar2{ :foo => \"bar\", :bar => \"baz\" } baz\n %br/\n %li.bar3{ :foo => \"bar\", :bar => \"baz\" } baz\n %br/\n",
}, },
], ],
}, },

100
zencoding.vim
View File

@@ -877,12 +877,12 @@ function! s:zen_parseIntoTree(abbr, type)
if multiplier <= 0 | let multiplier = 1 | endif if multiplier <= 0 | let multiplier = 1 | endif
if has_key(s:zen_settings[type], 'aliases') if has_key(s:zen_settings[type], 'aliases')
if has_key(s:zen_settings[type].aliases, tag_name) if has_key(s:zen_settings[type].aliases, tag_name)
let tag_name = s:zen_settings[type].aliases[tag_name] let tag_name = substitute(s:zen_settings[type].aliases[tag_name], '|', '${cursor}', 'g')
endif endif
endif endif
let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 } let current = { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0 }
if has_key(s:zen_settings[type], 'snippets') && has_key(s:zen_settings[type].snippets, tag_name) if has_key(s:zen_settings[type], 'snippets') && has_key(s:zen_settings[type].snippets, tag_name)
let current.snippet = s:zen_settings[type].snippets[tag_name] let current.snippet = substitute(s:zen_settings[type].snippets[tag_name], '|', '${cursor}', 'g')
else else
let current.name = substitute(tag_name, ':.*$', '', '') let current.name = substitute(tag_name, ':.*$', '', '')
if has_key(s:zen_settings[type], 'default_attributes') if has_key(s:zen_settings[type], 'default_attributes')
@@ -891,12 +891,12 @@ function! s:zen_parseIntoTree(abbr, type)
if type(default_attributes[tag_name]) == 4 if type(default_attributes[tag_name]) == 4
let a = default_attributes[tag_name] let a = default_attributes[tag_name]
for k in keys(a) for k in keys(a)
let current.attr[k] = len(a[k]) ? a[k] : '|' let current.attr[k] = len(a[k]) ? substitute(a[k], '|', '${cursor}', 'g') : '${cursor}'
endfor endfor
else else
for a in default_attributes[tag_name] for a in default_attributes[tag_name]
for k in keys(a) for k in keys(a)
let current.attr[k] = len(a[k]) ? a[k] : '|' let current.attr[k] = len(a[k]) ? substitute(a[k], '|', '${cursor}', 'g') : '${cursor}'
endfor endfor
endfor endfor
endif endif
@@ -1046,8 +1046,10 @@ function! s:zen_toString(...)
let tmp = '<' . current.name let tmp = '<' . current.name
for attr in keys(current.attr) for attr in keys(current.attr)
let val = current.attr[attr] let val = current.attr[attr]
if current.multiplier > 1 && val =~ '\$' if current.multiplier > 1 && val =~ '\$$'
let val = substitute(val, '\$', m+1, 'g') let doller = substitute(val, '^.\{-}\(\$\+\)$', '\1', '')
let val = substitute(val, '\(\$\+\)$', '', '')
let val .= printf('%0' . len(doller) . 'd', m+1)
endif endif
let tmp .= ' ' . attr . '="' . val . '"' let tmp .= ' ' . attr . '="' . val . '"'
if filter == 'c' if filter == 'c'
@@ -1089,9 +1091,9 @@ function! s:zen_toString(...)
let str .= " />\n" let str .= " />\n"
else else
if stridx(','.s:zen_settings[type].inline_elements.',', ','.current.name.',') == -1 && len(current.child) if stridx(','.s:zen_settings[type].inline_elements.',', ','.current.name.',') == -1 && len(current.child)
let str .= ">\n" . inner . "|</" . current.name . ">\n" let str .= ">\n" . inner . '${cursor}</' . current.name . ">\n"
else else
let str .= ">" . inner . "|</" . current.name . ">\n" let str .= ">" . inner . '${cursor}</' . current.name . ">\n"
endif endif
endif endif
if len(comment) > 0 | let str .= "<!-- /" . comment . " -->\n" . comment_indent | endif if len(comment) > 0 | let str .= "<!-- /" . comment . " -->\n" . comment_indent | endif
@@ -1099,43 +1101,46 @@ function! s:zen_toString(...)
if stridx(','.s:zen_settings[type].empty_elements.',', ','.current.name.',') != -1 if stridx(','.s:zen_settings[type].empty_elements.',', ','.current.name.',') != -1
let str .= " />" let str .= " />"
else else
let str .= ">" . inner . "|</" . current.name . ">" let str .= ">" . inner . '${cursor}</' . current.name . ">"
endif endif
endif endif
endif endif
elseif len(current.name) && type == 'haml' elseif type == 'haml'
let str .= '%' . current.name if len(current.name) > 0
let tmp = '' let str .= '%' . current.name
for attr in keys(current.attr) let tmp = ''
let val = current.attr[attr] for attr in keys(current.attr)
if current.multiplier > 1 && val =~ '\$' let val = current.attr[attr]
let val = substitute(val, '\$', m+1, 'g') if current.multiplier > 1 && val =~ '\$$'
let doller = substitute(val, '^.\{-}\(\$\+\)$', '\1', '')
let val = substitute(val, '\(\$\+\)$', '', '')
let val .= printf('%0' . len(doller) . 'd', m+1)
endif
if attr == 'id'
let str .= '#' . val
elseif attr == 'class'
let str .= '.' . val
else
if len(tmp) > 0 | let tmp .= ',' | endif
let tmp .= ' :' . attr . ' => "' . val . '"'
endif
endfor
if len(tmp)
let str .= '{' . tmp . ' }'
endif endif
if attr == 'id' if stridx(','.s:zen_settings['html'].empty_elements.',', ','.current.name.',') != -1
let str .= '#' . val let str .= "/\n"
elseif attr == 'class' elseif stridx(','.s:zen_settings['html'].block_elements.',', ','.current.name.',') != -1 && len(current.child) == 0
let str .= '.' . val let str .= '<'
else
if len(tmp) > 0 | let tmp .= ',' | endif
let tmp .= ' :' . attr . ' => "' . val . '"'
endif endif
endfor
if len(tmp)
let str .= '{' . tmp . ' }'
endif
if stridx(','.s:zen_settings['html'].empty_elements.',', ','.current.name.',') != -1
let str .= '/'
elseif stridx(','.s:zen_settings['html'].block_elements.',', ','.current.name.',') != -1 && len(current.child) == 0
let str .= '<'
endif endif
if len(current.value) > 0 if len(current.value) > 0
let lines = split(current.value, "\n")[1:] let lines = split(current.value[1:-2], "\n")
let str .= " " . lines[0] let str .= " " . lines[0]
for line in lines[1:] for line in lines[1:]
let str .= " |\n " . line let str .= " |\n" . line
endfor endfor
endif endif
let str .= "\n"
let inner = '' let inner = ''
for child in current.child for child in current.child
let inner .= s:zen_toString(child, type, inline, filter) let inner .= s:zen_toString(child, type, inline, filter)
@@ -1143,11 +1148,11 @@ function! s:zen_toString(...)
let inner .= "\n" let inner .= "\n"
endif endif
endfor endfor
let inner = " " . substitute(inner, "\n", "\n ", 'g') let inner = substitute(inner, "\n", "\n ", 'g')
let str .= substitute(inner, " $", "", 'g') let str .= substitute(inner, " $", "", 'g')
else else
if len(current.snippet) > 0 if len(current.snippet) > 0
let tmp = current.snippet let tmp = substitute(current.snippet, '|', '${cursor}', 'g')
if type == 'css' && filter == 'fc' if type == 'css' && filter == 'fc'
let tmp = substitute(tmp, '^\([^:]\+\):\(.*\)$', '\1: \2', '') let tmp = substitute(tmp, '^\([^:]\+\):\(.*\)$', '\1: \2', '')
endif endif
@@ -1272,17 +1277,16 @@ function! s:zen_expandAbbr(mode) range
endfor endfor
endif endif
if len(expand) if len(expand)
let expand = substitute(expand, '|', '$cursor$', '') if expand !~ '\${cursor}'
let expand = substitute(expand, '|', '', 'g') if a:mode == 2 |
let expand = substitute(expand, '\$cursor\$', '|', '') let expand = '${cursor}' . expand
if expand !~ '|'
if a:mode == 2
let expand = '|' . expand
else else
let expand .= '|' let expand .= '${cursor}'
endif endif
endif endif
let expand = substitute(expand, '${lang}', s:zen_settings.lang, 'g') let expand = substitute(expand, '${lang}', s:zen_settings.lang, 'g')
let expand = substitute(expand, '\${cursor}', '$cursor$', '')
let expand = substitute(expand, '\${cursor}', '', 'g')
if has_key(s:zen_settings, 'timezone') && len(s:zen_settings.timezone) if has_key(s:zen_settings, 'timezone') && len(s:zen_settings.timezone)
let expand = substitute(expand, '${datetime}', strftime("%Y-%m-%dT%H:%M:%S") . ' ' . s:zen_settings.timezone, 'g') let expand = substitute(expand, '${datetime}', strftime("%Y-%m-%dT%H:%M:%S") . ' ' . s:zen_settings.timezone, 'g')
else else
@@ -1304,8 +1308,8 @@ function! s:zen_expandAbbr(mode) range
endif endif
endif endif
silent! exe "normal! ".len(part)."h" silent! exe "normal! ".len(part)."h"
if search('|') if search('\$cursor\$', 'e')
silent! exe "normal! a\<c-h>" silent! exe "normal! a" . repeat("\<c-h>", 8)
endif endif
endfunction endfunction
@@ -1663,8 +1667,8 @@ function! ZenExpand(abbr, type, orig)
let expand .= s:zen_toString(item, a:type, 0, filter) let expand .= s:zen_toString(item, a:type, 0, filter)
endfor endfor
if a:orig == 0 if a:orig == 0
let expand = substitute(expand, '${lang}', s:zen_settings.lang, 'g') let expand = substitute(expand, '\${lang}', s:zen_settings.lang, 'g')
let expand = substitute(expand, '|', '', 'g') let expand = substitute(expand, '\${cursor}', '', 'g')
endif endif
return expand return expand
endfunction endfunction
@@ -1715,7 +1719,7 @@ function! ZenCompleteTag(findstart, base)
if has_key(s:zen_settings[type], 'aliases') if has_key(s:zen_settings[type], 'aliases')
for item in values(s:zen_settings[type].aliases) for item in values(s:zen_settings[type].aliases)
if stridx(item, a:base) != -1 if stridx(item, a:base) != -1
call add(res, item) call add(res, substitute(item, '|', '', 'g'))
endif endif
endfor endfor
endif endif