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

fix import formatting in description for davidhalter/jedi-vim#42

Browse Source
This commit is contained in:
David Halter
2012-11-27 13:07:06 +01:00
parent 7b3d8b6772
commit e5b0989afe
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/api_classes.py
View File

@@ -156,7 +156,7 @@ class Completion(BaseOutput):
if parent is None: if parent is None:
return '' return ''
t = self.type t = self.type
if t == 'Statement': if t == 'Statement' or t == 'Import':
desc = self.definition.get_code(False) desc = self.definition.get_code(False)
else: else:
desc = '.'.join(str(p) for p in self.path) desc = '.'.join(str(p) for p in self.path)

10
jedi/parsing.py
View File

@@ -573,8 +573,8 @@ class Import(Simple):
self.relative_count = relative_count self.relative_count = relative_count
self.defunct = defunct self.defunct = defunct
def get_code(self): def get_code(self, new_line=True):
# in case one thing is None # in case one of the names is None
alias = self.alias or '' alias = self.alias or ''
namespace = self.namespace or '' namespace = self.namespace or ''
from_ns = self.from_ns or '' from_ns = self.from_ns or ''
@@ -583,13 +583,15 @@ class Import(Simple):
ns_str = "%s as %s" % (namespace, alias) ns_str = "%s as %s" % (namespace, alias)
else: else:
ns_str = str(namespace) ns_str = str(namespace)
nl = '\n' if new_line else ''
if self.from_ns or self.relative_count: if self.from_ns or self.relative_count:
if self.star: if self.star:
ns_str = '*' ns_str = '*'
dots = '.' * self.relative_count dots = '.' * self.relative_count
return "from %s%s import %s\n" % (dots, from_ns, ns_str) return "from %s%s import %s%s" % (dots, from_ns, ns_str, nl)
else: else:
return "import %s\n" % ns_str return "import %s%s" % (ns_str, nl)
def get_defined_names(self): def get_defined_names(self):
if self.defunct: if self.defunct: