From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Jun 2016 16:11:56 +0200 Subject: Fix submodules --- vim/bundle/vim-snipmate | 1 + vim/bundle/vim-snipmate/t/parser.vim | 142 ----------------------------------- 2 files changed, 1 insertion(+), 142 deletions(-) create mode 160000 vim/bundle/vim-snipmate delete mode 100644 vim/bundle/vim-snipmate/t/parser.vim (limited to 'vim/bundle/vim-snipmate/t/parser.vim') diff --git a/vim/bundle/vim-snipmate b/vim/bundle/vim-snipmate new file mode 160000 index 0000000..ee433e4 --- /dev/null +++ b/vim/bundle/vim-snipmate @@ -0,0 +1 @@ +Subproject commit ee433e43c76c768c95ad6d9af67c4cd4b40f7eac diff --git a/vim/bundle/vim-snipmate/t/parser.vim b/vim/bundle/vim-snipmate/t/parser.vim deleted file mode 100644 index c5cf873..0000000 --- a/vim/bundle/vim-snipmate/t/parser.vim +++ /dev/null @@ -1,142 +0,0 @@ -describe 'snippet parser' - - before - function! Parse(snippet, ...) - let [snip, stops] = snipmate#parse#snippet(a:snippet, (a:0 ? a:1 : 1)) - return (a:0 > 1 && a:2) ? [snip, stops] : snip - endfunction - let b:snipmate_visual = 'testvisual' - end - - it 'parses numeric $id and ${id} vars as [id] lists' - let expect = [[[1234567890]]] - Expect Parse('$1234567890') == expect - Expect Parse('${1234567890}') == expect - end - - it 'disregards $ or ${ followed by a non-id' - Expect Parse('$x1') == [['x1']] - Expect Parse('${x}1') == [['x}1']] - Expect Parse('$VISUA1') == [['VISUA1']] - Expect Parse('${VISUA}1') == [['VISUA}1']] - end - - it 'gathers references to each instance of each stop id' - let [snip, b:stops] = Parse('x$1x${2:x$1x}x$1x${1/a/b}x$VISUALx', 1, 1) - function! InstanceFound(list) - return !empty(filter(copy(b:stops[a:list[0]].instances), - \ 'v:val is a:list')) - endfunction - function! CheckList(list) - for item in a:list - if type(item) == type([]) - Expect InstanceFound(item) to_be_true - call CheckList(item) - endif - unlet item " E732 - endfor - endfunction - call CheckList(snip[0]) - end - - it 'parses mirror substitutions ${n/pat/sub} as [n, {...}]' - let expect = [[[1, { 'pat' : 'abc', 'sub' : 'def' }]]] - Expect Parse('${1/abc/def}') == expect - let expect[0][0][1].flags = '' - Expect Parse('${1/abc/def/}') == expect - let expect[0][0][1].flags = 'g' - Expect Parse('${1/abc/def/g}') == expect - end - - it 'reads patterns literally except for "\/"' - Expect Parse('${1/\a\/b/\c\/d\}}') == [[[1, { 'pat' : '\a/b', 'sub' : '\c/d}' }]]] - end - - it 'parses vars with placeholders as [id, placeholder] lists' - Expect Parse('${1:abc}') == [[[1, 'abc']]] - end - - it 'evaluates backtick expressions' - Expect Parse('`fnamemodify("x.y", ":r")`') == [['x']] - end - - it 'parses placeholders for vars and other specials' - let text = 'a `fnamemodify("x.y", ":r")` ${2:(${3/a/b})}' - let expect = ['a x ', [2, '(', [3, { 'pat' : 'a', 'sub' : 'b' }], ')']] - Expect Parse(text) == [expect] - Expect Parse(printf('${1:%s}', text)) == [[[1] + expect]] - end - - it 'converts tabs according to &et, &sts, &sw, &ts' - " &noet -> leave tabs alone - setl noet - Expect Parse("abc\tdef\n\t\tghi") == [["abc\tdef"], ["\t\tghi"]] - - " &et -> &sts or &sw - setl et sts=2 sw=3 - Expect Parse("abc\tdef\n\t\tghi") == [["abc def"], [" ghi"]] - - setl et sts=0 sw=3 - Expect Parse("abc\tdef\n\t\tghi") == [["abc def"], [" ghi"]] - - setl et sts=-1 sw=3 - Expect Parse("abc\tdef\n\t\tghi") == [["abc def"], [" ghi"]] - - " See #227 - if exists('*shiftwidth') - setl et sts=0 sw=0 ts=3 - Expect Parse("abc\tdef\n\t\tghi") == [["abc def"], [" ghi"]] - endif - end - - it 'parses backslashes as escaping the next character or joining lines' - Expect Parse('x\x') == [['xx']] - Expect Parse('x\\x') == [['x\x']] - Expect Parse("x\\\nx") == [['xx']] - Expect Parse('x\$1') == [['x$1']] - Expect Parse('${1:\}}') == [[[1, '}']]] - Expect Parse('`fnamemodify("\`.x", ":r")`') == [['`']] - Expect Parse('\`x\`') == [['`x`']] - end - - it 'splits text at newlines' - Expect Parse("x\nx") == [['x'], ['x']] - end - - it 'joins evaluated expressions to surrounding text on the same line' - let g:foo = 'bar' - Expect Parse("x`g:foo`x") == [['xbarx']] - Expect Parse("x`g:foo`\nx") == [['xbar'], ['x']] - Expect Parse("x\n`g:foo`x") == [['x'], ['barx']] - end - - it 'expands $VISUAL placeholders with any indents' - Expect Parse("x$VISUALx") == [['xtestvisualx']] - let b:snipmate_visual = " foo\nbar\n baz" - setl noet - Expect Parse("\tx\n\t$VISUAL\nx") == [["\tx"], ["\t foo"], ["\tbar"], - \ ["\t baz"], ["x"]] - end - - it 'determines which var with an id is the stop' - let [snip, stops] = Parse("$1$1$1", 0, 1) - Expect snip == [[[1, "", stops[1]], [1, {}], [1, {}]]] - - let [snip, stops] = Parse("$1${1}$1", 0, 1) - Expect snip == [[[1, "", stops[1]], [1, {}], [1, {}]]] - - let [snip, stops] = Parse("$1${1:}$1", 0, 1) - Expect snip == [[[1, {}], [1, "", stops[1]], [1, {}]]] - - end - - it 'picks the first of many possible stops' - let [snip, stops] = Parse("$1${1:foo}${1:bar}", 0, 1) - Expect snip == [[[1, {}], [1, "foo", stops[1]], [1, {}]]] - end - - it 'represents empty lines as an empty string' - Expect Parse("foo\n\nbar") == [['foo'], [''], ['bar']] - end - -end -- cgit v1.2.3