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

improve get_code of parsing_representation scopes

Browse Source
This commit is contained in:
David Halter
2013-03-16 23:26:20 +04:30
parent 841b0be19a
commit df058b93c2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jedi/parsing_representation.py
View File

@@ -193,15 +193,16 @@ class Scope(Simple, IsScope):
string = "" string = ""
if len(self.docstr) > 0: if len(self.docstr) > 0:
string += '"""' + self.docstr + '"""\n' string += '"""' + self.docstr + '"""\n'
for i in self.imports:
string += i.get_code()
for sub in self.subscopes:
string += sub.get_code(first_indent=True, indention=indention)
returns = self.returns if hasattr(self, 'returns') else [] returns = self.returns if hasattr(self, 'returns') else []
ret_str = '' if isinstance(self, Lambda) else 'return ' objs = self.subscopes + self.imports + self.statements + returns
for stmt in self.statements + returns: for obj in sorted(objs, key=lambda x: x.start_pos):
string += (ret_str if stmt in returns else '') + stmt.get_code() if isinstance(obj, Scope):
string += obj.get_code(first_indent=True, indention=indention)
else:
if obj in returns and not isinstance(self, Lambda):
string += 'yield ' if self.is_generator else 'return '
string += obj.get_code()
if first_indent: if first_indent:
string = common.indent_block(string, indention=indention) string = common.indent_block(string, indention=indention)
@@ -396,7 +397,7 @@ class Class(Scope):
string = "\n".join('@' + stmt.get_code() for stmt in self.decorators) string = "\n".join('@' + stmt.get_code() for stmt in self.decorators)
string += 'class %s' % (self.name) string += 'class %s' % (self.name)
if len(self.supers) > 0: if len(self.supers) > 0:
sup = ','.join(stmt.get_code() for stmt in self.supers) sup = ', '.join(stmt.get_code(False) for stmt in self.supers)
string += '(%s)' % sup string += '(%s)' % sup
string += ':\n' string += ':\n'
string += super(Class, self).get_code(True, indention) string += super(Class, self).get_code(True, indention)
@@ -448,7 +449,7 @@ class Function(Scope):
def get_code(self, first_indent=False, indention=' '): def get_code(self, first_indent=False, indention=' '):
string = "\n".join('@' + stmt.get_code() for stmt in self.decorators) string = "\n".join('@' + stmt.get_code() for stmt in self.decorators)
params = ','.join([stmt.get_code() for stmt in self.params]) params = ', '.join([stmt.get_code(False) for stmt in self.params])
string += "def %s(%s):\n" % (self.name, params) string += "def %s(%s):\n" % (self.name, params)
string += super(Function, self).get_code(True, indention) string += super(Function, self).get_code(True, indention)
if self.is_empty(): if self.is_empty():