X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b863fd7bc83dfe237652020fd884490ed57e30ee..d4b51f09d83f75a663c5711af77e0e6da40764a9:/vim/ultisnips/all.snippets diff --git a/vim/ultisnips/all.snippets b/vim/ultisnips/all.snippets index 0a637f6..71a46c2 100644 --- a/vim/ultisnips/all.snippets +++ b/vim/ultisnips/all.snippets @@ -12,7 +12,7 @@ def _parse_comments(s): flags, text = next(i).split(':', 1) if len(flags) == 0: - rv.append((text, text, text, "")) + rv.append((text, text, text, text, "")) # parse 3-part comment, but ignore those with O flag elif 's' in flags and 'O' not in flags: ctriple = [] @@ -29,12 +29,16 @@ def _parse_comments(s): flags,text = next(i).split(':', 1) assert(flags[0] == 'e') ctriple.append(text) - ctriple.append(indent) - rv.append(ctriple) - elif 'b' in flags: + flags,text = next(i).split(':', 1) + assert(len(flags) == 0) + ctriple.append(text) + + ctriple.append(indent) + rv.insert(0, ctriple) + elif 'b' in flags and 'f' not in flags: if len(text) == 1: - rv.insert(0, (text,text,text, "")) + rv.insert(0, (text,text,text, text, "")) except StopIteration: return rv @@ -43,7 +47,8 @@ def _get_comment_format(): the current file. """ return _parse_comments(vim.eval("&comments"))[0] -b, m, e, i = _get_comment_format() +b, m, e, c, i = _get_comment_format() + def _git_user_name(): try: snip.rv = subprocess.check_output(["git", "config", "user.name"]).strip() @@ -58,6 +63,14 @@ def _git_user_email(): endglobal +snippet fix "FIXME" w +`!p snip.rv = c`FIXME~~sb ${VISUAL}${0} (`!v strftime("%Y-%m-%d")`) +endsnippet + +snippet todo "TODO" w +`!p snip.rv = c`TODO~~sb ${VISUAL}${0} (`!v strftime("%Y-%m-%d")`) +endsnippet + snippet GPL2 "GPL2 License" b `!p snip.rv = b` `!p snip.rv = i + m` ${1:One line to give the program's name and a brief description.} @@ -168,7 +181,7 @@ snippet AGPL3 "AGPL3 License" b ${0} endsnippet -snippet GMGPL linking exception "GMGPL linking exception License" b +snippet GMGPL "GMGPL linking exception License" b `!p snip.rv = b` `!p snip.rv = i + m` As a special exception, if other files instantiate generics from `!p snip.rv = i + m` this unit, or you link this unit with other files to produce an