From 8cfa121b4d29a95092c9230cc5d06343ee1b779f Mon Sep 17 00:00:00 2001
From: Jacob Niehus <jacob.niehus@gmail.com>
Date: Sat, 22 Aug 2015 17:27:41 -0700
Subject: [PATCH] Fix using tabs/splits instead of buffers

---
 jedi_vim.py | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/jedi_vim.py b/jedi_vim.py
index eb2d7d6..eb5fd29 100644
--- a/jedi_vim.py
+++ b/jedi_vim.py
@@ -245,9 +245,11 @@ def goto(mode="goto", no_output=False):
                     echo_highlight("Builtin modules cannot be displayed (%s)."
                                    % d.desc_with_module)
             else:
-                if vim_eval('g:jedi#use_tag_stack') == '1':
-                    if not can_switch_buffers():
+                if d.module_path != vim.current.buffer.name:
+                    result = new_buffer(d.module_path, using_tagstack=True)
+                    if not result:
                         return []
+                if d.module_path and vim_eval('g:jedi#use_tag_stack') == '1':
                     with open(vim_eval('tempname()'), 'w') as f:
                         tagname = d.name
                         while vim_eval('taglist("^%s$")' % tagname) != []:
@@ -260,12 +262,7 @@ def goto(mode="goto", no_output=False):
                         vim.command('set tags+=%s' % f.name)
                         vim.command('tjump %s' % tagname)
                         vim.command('set tags-=%s' % f.name)
-                else:
-                    if d.module_path != vim.current.buffer.name:
-                        result = new_buffer(d.module_path)
-                        if not result:
-                            return []
-                    vim.current.window.cursor = d.line, d.column
+                vim.current.window.cursor = d.line, d.column
         else:
             # multiple solutions
             lst = []
@@ -585,7 +582,7 @@ def py_import_completions():
 
 
 @catch_and_print_exceptions
-def new_buffer(path, options=''):
+def new_buffer(path, options='', using_tagstack=False):
     # options are what you can to edit the edit options
     if vim_eval('g:jedi#use_tabs_not_buffers') == '1':
         _tabnew(path, options)
@@ -604,9 +601,15 @@ def new_buffer(path, options=''):
             print('g:jedi#use_splits_not_buffers value is not correct, valid options are: %s' % ','.join(split_options.keys()))
         else:
             vim_command(split_options[user_split_option] + " %s" % path)
+    elif using_tagstack:
+        return True
     else:
-        if not can_switch_buffers():
-            return False
+        if vim_eval("!&hidden && &modified") == '1':
+            if vim_eval("bufname('%')") is None:
+                echo_highlight('Cannot open a new buffer, use `:set hidden` or save your buffer')
+                return False
+            else:
+                vim_command('w')
         vim_command('edit %s %s' % (options, escape_file_path(path)))
     # sometimes syntax is being disabled and the filetype not set.
     if vim_eval('!exists("g:syntax_on")') == '1':
@@ -616,17 +619,6 @@ def new_buffer(path, options=''):
     return True
 
 
-@catch_and_print_exceptions
-def can_switch_buffers():
-    if vim_eval("!&hidden && &modified") == '1':
-        if vim_eval("bufname('%')") is None:
-            echo_highlight('Cannot open a new buffer, use `:set hidden` or save your buffer')
-            return False
-        else:
-            vim_command('w')
-    return True
-
-
 @catch_and_print_exceptions
 def _tabnew(path, options=''):
     """