jedi_vim.completions: do not clear signatures for a:findstart

Also use the new method to restore signatures.

Author: blueyed

jedi_vim.py

@@ -157,56 +157,66 @@ def get_script(source=None, column=None):
 @catch_and_print_exceptions
 def completions():
     row, column = vim.current.window.cursor
-    # Clear call signatures in the buffer so they aren't seen by the completer.
-    # Call signatures in the command line can stay.
-    if int(vim_eval("g:jedi#show_call_signatures")) == 1:
-        clear_call_signatures()
     if vim.eval('a:findstart') == '1':
         count = 0
         for char in reversed(vim.current.line[:column]):
             if not re.match('[\w\d]', char):
                 break
             count += 1
         vim.command('return %i' % (column - count))
-    else:
-        base = vim.eval('a:base')
-        source = ''
-        for i, line in enumerate(vim.current.buffer):
-            # enter this path again, otherwise source would be incomplete
-            if i == row - 1:
-                source += line[:column] + base + line[column:]
-            else:
-                source += line
-            source += '\n'
-        # here again hacks, because jedi has a different interface than vim
-        column += len(base)
-        try:
-            script = get_script(source=source, column=column)
-            completions = script.completions()
-            signatures = script.call_signatures()
-
-            out = []
-            for c in completions:
-                d = dict(word=PythonToVimStr(c.name[:len(base)] + c.complete),
-                         abbr=PythonToVimStr(c.name_with_symbols),
-                         # stuff directly behind the completion
-                         menu=PythonToVimStr(c.description),
-                         info=PythonToVimStr(c.docstring()),  # docstr
-                         icase=1,  # case insensitive
-                         dup=1  # allow duplicates (maybe later remove this)
-                         )
-                out.append(d)
-
-            strout = str(out)
-        except Exception:
-            # print to stdout, will be in :messages
-            print(traceback.format_exc())
-            strout = ''
-            completions = []
-            signatures = []
+        return
 
-        show_call_signatures(signatures)
-        vim.command('return ' + strout)
+    # Clear call signatures in the buffer so they aren't seen by the completer.
+    # Call signatures in the command line can stay.
+    if int(vim_eval("g:jedi#show_call_signatures")) == 1:
+        restore_signatures = False
+        for linenr, line in vim_eval('get(b:, "_jedi_callsig_orig", {})').items():
+            # Check that the line would be reset, helps with keeping a single
+            # undochain.
+            if line != vim.current.buffer[int(linenr)-1]:
+                vim_command('silent! undojoin')
+                vim.current.buffer[int(linenr)-1] = line
+                restore_signatures = True
+
+    base = vim.eval('a:base')
+    source = ''
+    for i, line in enumerate(vim.current.buffer):
+        # enter this path again, otherwise source would be incomplete
+        if i == row - 1:
+            source += line[:column] + base + line[column:]
+        else:
+            source += line
+        source += '\n'
+    # here again hacks, because jedi has a different interface than vim
+    column += len(base)
+    try:
+        script = get_script(source=source, column=column)
+        completions = script.completions()
+
+        out = []
+        for c in completions:
+            d = dict(word=PythonToVimStr(c.name[:len(base)] + c.complete),
+                     abbr=PythonToVimStr(c.name_with_symbols),
+                     # stuff directly behind the completion
+                     menu=PythonToVimStr(c.description),
+                     info=PythonToVimStr(c.docstring()),  # docstr
+                     icase=1,  # case insensitive
+                     dup=1  # allow duplicates (maybe later remove this)
+                     )
+            out.append(d)
+
+        strout = str(out)
+    except Exception:
+        # print to stdout, will be in :messages
+        print(traceback.format_exc())
+        strout = ''
+        completions = []
+
+    if restore_signatures:
+        cursor = vim.current.window.cursor
+        vim_command('undo')
+        vim.current.window.cursor = cursor
+    vim.command('return ' + strout)
 
 
 @contextmanager