From 605d1ed6f505c7eb4127f519894a3bc2ba102643 Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Thu, 26 Jul 2012 15:40:46 +0200
Subject: [PATCH] vim plugin now handles cases correctly

---
 jedi.vim | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/jedi.vim b/jedi.vim
index e1ff93d..8ce85d9 100644
--- a/jedi.vim
+++ b/jedi.vim
@@ -15,20 +15,34 @@ endif
 " ------------------------------------------------------------------------
 
 function! jedi#Complete(findstart, base)
-    if a:findstart == 1
-        return col('.')
-    else
 python << PYTHONEOF
 if 1:
-        # TODO change the finstart column, to switch cases, if they are not right.
-        row, column = vim.current.window.cursor
+    row, column = vim.current.window.cursor
+    print 
+    if vim.eval('a:findstart') == '1':
+        count = 0
+        for char in reversed(vim.current.line[:column-1]):
+            if not re.match('[\w\d]', char):
+                break
+            count += 1
+        vim.command('return %i' % (column - 1 - count))
+    else:
         buf_path = vim.current.buffer.name
-        source = '\n'.join(vim.current.buffer)
+        base = vim.eval('a:base')
+        source = ''
+        for i, line in enumerate(vim.current.buffer):
+            source += line
+            # enter this path again, otherwise source would be incomplete
+            if i == row - 1:
+                source += base
+            source += '\n'
+        # here again, the hacks, because jedi has a different interface than vim
+        column += len(base)
         try:
             completions = functions.complete(source, row, column, buf_path)
             out = []
             for c in completions:
-                d = dict(word=c.complete,
+                d = dict(word=str(c),
                          abbr=str(c),
                          # stuff directly behind the completion
                          # TODO change it so that ' are allowed (not used now, because of repr)
@@ -97,6 +111,7 @@ from os.path import dirname
 sys.path.insert(0, dirname(dirname(vim.eval('s:current_file'))))
 
 import traceback  # for exception output
+import re
 
 import functions
 import evaluate