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-snippets | 1 + vim/bundle/vim-snippets/pythonx/vimsnippets.py | 92 -------------------------- 2 files changed, 1 insertion(+), 92 deletions(-) create mode 160000 vim/bundle/vim-snippets delete mode 100644 vim/bundle/vim-snippets/pythonx/vimsnippets.py (limited to 'vim/bundle/vim-snippets/pythonx') diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets new file mode 160000 index 0000000..15d7e5e --- /dev/null +++ b/vim/bundle/vim-snippets @@ -0,0 +1 @@ +Subproject commit 15d7e5ec26ec93adee4051b6359be90a943aa38d diff --git a/vim/bundle/vim-snippets/pythonx/vimsnippets.py b/vim/bundle/vim-snippets/pythonx/vimsnippets.py deleted file mode 100644 index 6a446a2..0000000 --- a/vim/bundle/vim-snippets/pythonx/vimsnippets.py +++ /dev/null @@ -1,92 +0,0 @@ -"""Helper methods used in UltiSnips snippets.""" - -import string, vim - -def complete(tab, opts): - """ - get options that start with tab - - :param tab: query string - :param opts: list that needs to be completed - - :return: a string that start with tab - """ - msg = "({0})" - if tab: - opts = [m[len(tab):] for m in opts if m.startswith(tab)] - if len(opts) == 1: - return opts[0] - - if not len(opts): - msg = "{0}" - return msg.format("|".join(opts)) - -def _parse_comments(s): - """ Parses vim's comments option to extract comment format """ - i = iter(s.split(",")) - - rv = [] - try: - while True: - # get the flags and text of a comment part - flags, text = next(i).split(':', 1) - - if len(flags) == 0: - rv.append((text, text, text, "")) - # parse 3-part comment, but ignore those with O flag - elif 's' in flags and 'O' not in flags: - ctriple = ["TRIPLE"] - indent = "" - - if flags[-1] in string.digits: - indent = " " * int(flags[-1]) - ctriple.append(text) - - flags, text = next(i).split(':', 1) - assert flags[0] == 'm' - ctriple.append(text) - - flags, text = next(i).split(':', 1) - assert flags[0] == 'e' - ctriple.append(text) - ctriple.append(indent) - - rv.append(ctriple) - elif 'b' in flags: - if len(text) == 1: - rv.insert(0, ("SINGLE_CHAR", text, text, text, "")) - except StopIteration: - return rv - -def get_comment_format(): - """ Returns a 4-element tuple (first_line, middle_lines, end_line, indent) - representing the comment format for the current file. - - It first looks at the 'commentstring', if that ends with %s, it uses that. - Otherwise it parses '&comments' and prefers single character comment - markers if there are any. - """ - commentstring = vim.eval("&commentstring") - if commentstring.endswith("%s"): - c = commentstring[:-2] - return (c, c, c, "") - comments = _parse_comments(vim.eval("&comments")) - for c in comments: - if c[0] == "SINGLE_CHAR": - return c[1:] - return comments[0][1:] - - -def make_box(twidth, bwidth=None): - b, m, e, i = (s.strip() for s in get_comment_format()) - bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2 - sline = b + m + bwidth_inner * m[0] + 2 * m[0] - nspaces = (bwidth_inner - twidth) // 2 - mlines = i + m + " " + " " * nspaces - mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m - eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e - return sline, mlines, mlinee, eline - -def foldmarker(): - "Return a tuple of (open fold marker, close fold marker)" - return vim.eval("&foldmarker").split(",") -- cgit v1.2.3