vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fixes for the new python semantic completer

Browse Source
This commit is contained in:
Strahinja Val Markovic 2013-03-24 14:38:55 -07:00
parent 26d81c3c5f
commit 0954ff31d9
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/completers/python/jedi_completer.py
View File

@ -1,4 +1,7 @@
#!/usr/bin/env python
#
# Copyright (C) 2011, 2012 Stephen Sugden <me@stephensugden.com> # Copyright (C) 2011, 2012 Stephen Sugden <me@stephensugden.com>
# Strahinja Val Markovic <val@markovic.io>
# #
# This file is part of YouCompleteMe. # This file is part of YouCompleteMe.
# #
@ -54,16 +57,9 @@ class JediCompleter(Completer):
""" Just python """ """ Just python """
return ['python'] return ['python']
def ShouldUseNowInner(self, start_column):
"""
Use Jedi if we are completing an identifier immediately after a dot.
"""
line = str(vim.current.line)
result = line[start_column - 1] == '.'
return result
def CandidatesForQueryAsyncInner(self, query): def CandidatesForQueryAsyncInner(self, query):
self._query = query self._query = query
self._candidates = None
self._candidates_ready.clear() self._candidates_ready.clear()
self._query_ready.set() self._query_ready.set()
@ -72,7 +68,7 @@ class JediCompleter(Completer):
return WaitAndClear(self._candidates_ready, timeout=0.005) return WaitAndClear(self._candidates_ready, timeout=0.005)
else: else:
self._start_completion_thread() self._start_completion_thread()
return True return False
def CandidatesFromStoredRequestInner(self): def CandidatesFromStoredRequestInner(self):
return self._candidates or [] return self._candidates or []
@ -94,7 +90,6 @@ class JediCompleter(Completer):
column = len(before) + 1 column = len(before) + 1
source = "\n".join(lines) source = "\n".join(lines)
script = Script(source, line + 1, column, filename) script = Script(source, line + 1, column, filename)
self._candidates = [{'word': str(completion.word), self._candidates = [{'word': str(completion.word),
@ -104,12 +99,6 @@ class JediCompleter(Completer):
self._candidates_ready.set() self._candidates_ready.set()
def OnInsertLeave(self):
""" Tell the worker thread to exit """
self._exit = True
self._query_ready.set()
self._candidates = None
def WaitAndClear(event, timeout=None): def WaitAndClear(event, timeout=None):
ret = event.wait(timeout) ret = event.wait(timeout)