massive update, probably broken

[dotfiles/.git] / .config / coc / extensions / node_modules / coc-snippets / python / ultisnips.py

diff --git a/.config/coc/extensions/node_modules/coc-snippets/python/ultisnips.py b/.config/coc/extensions/node_modules/coc-snippets/python/ultisnips.py
index 9a753e0477b0e02180b26b744d8cdda221bb8b29..e66bd2ff2e40840f005e8d937dfa43ef37172f2d 100644 (file)
--- a/.config/coc/extensions/node_modules/coc-snippets/python/ultisnips.py
+++ b/.config/coc/extensions/node_modules/coc-snippets/python/ultisnips.py
@@ -129,7 +129,7 @@ class SnippetUtil(object):
         except IndexError:
             self.indent = ""
 
-    def mkline(self, line="", indent=""):
+    def mkline(self, line="", indent=None):
         """Creates a properly set up line.
 
         :line: the text to add
@@ -137,6 +137,17 @@ class SnippetUtil(object):
                  if None, it uses the default amount
 
         """
+        if indent is None:
+            indent = self.indent
+            # this deals with the fact that the first line is
+            # already properly indented
+            if "\n" not in self._rv:
+                try:
+                    indent = indent[len(self._initial_indent) :]
+                except IndexError:
+                    indent = ""
+            indent = self._ind.spaces_to_indent(indent)
+
         return indent + line
 
     def reset_indent(self):
@@ -249,9 +260,9 @@ class ContextSnippet(object):
         self.buffer = vim.current.buffer
         self.window = vim.current.window
         self.cursor = _SnippetUtilCursor(vim.current.window.cursor)
-        self.line = vim.call("line", ".") - 1
-        self.column = vim.call("col", ".") - 1
-        line = vim.call("getline", ".")
+        self.line = vim.current.window.cursor[0] - 1
+        self.column = vim.current.window.cursor[1] - 1
+        line = vim.eval('line(".")')
         self.after = line[self.column :]
         if "coc_selected_text" in vim.vars:
             self.visual_mode = vim.eval("visualmode()")