VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Completion now always takes a NamePart as input.

Browse Source
This commit is contained in:
Dave Halter
2014-09-10 18:59:08 +02:00
parent 0eea30f227
commit 1fb9b4bc6b
7 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/evaluate/imports.py
View File

@@ -29,6 +29,7 @@ from jedi.common import source_to_unicode
from jedi.evaluate import compiled
from jedi.evaluate import analysis
from jedi.evaluate.cache import memoize_default, NO_DEFAULT
from jedi.evaluate.helpers import FakeSubModule
class ModuleNotFound(Exception):
@@ -368,12 +369,12 @@ class _Importer(object):
pos = (part._line, part._column)
try:
self.import_path = (
pr.NamePart('flask_' + str(part), part.parent, pos),
pr.NamePart(FakeSubModule, 'flask_' + str(part), part.parent, pos),
) + orig_path[3:]
return self._real_follow_file_system()
except ModuleNotFound as e:
self.import_path = (
pr.NamePart('flaskext', part.parent, pos),
pr.NamePart(FakeSubModule, 'flaskext', part.parent, pos),
) + orig_path[2:]
return self._real_follow_file_system()
return self._real_follow_file_system()

3
jedi/evaluate/iterable.py
View File

@@ -237,7 +237,8 @@ class ArrayMethod(IterableWrapper):
@property
@underscore_memoization
def names(self):
return [pr.NamePart(unicode(n), self, n.start_pos) for n in self.name.names]
# TODO remove this method, we need the ArrayMethod input to be a NamePart.
return [pr.NamePart(self.name._sub_module, unicode(n), self, n.start_pos) for n in self.name.names]
def __getattr__(self, name):
# Set access privileges:

3
jedi/evaluate/representation.py
View File

@@ -294,7 +294,8 @@ class InstanceElement(use_metaclass(CachedMetaClass, pr.Base)):
@property
@underscore_memoization
def names(self):
return [pr.NamePart(unicode(n), self, n.start_pos) for n in self.var.names]
return [pr.NamePart(helpers.FakeSubModule, unicode(n), self, n.start_pos)
for n in self.var.names]
@property
@underscore_memoization