VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-16 10:37:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a problem with classes in docstrings

Browse Source
This commit is contained in:
David Halter
2013-08-31 11:32:35 +04:30
parent b68e3cc8de
commit 5267e13e0a
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jedi/fast_parser.py
View File

@@ -259,7 +259,7 @@ class FastParser(use_metaclass(CachedFastParser)):
r_keyword = '^[ \t]*(def|class|@|%s)' % '|'.join(common.FLOWS) r_keyword = '^[ \t]*(def|class|@|%s)' % '|'.join(common.FLOWS)
lines = code.splitlines() self._lines = code.splitlines()
current_lines = [] current_lines = []
parts = [] parts = []
is_decorator = False is_decorator = False
@@ -269,7 +269,7 @@ class FastParser(use_metaclass(CachedFastParser)):
in_flow = False in_flow = False
add_to_last = False add_to_last = False
# All things within flows are simply being ignored. # All things within flows are simply being ignored.
for i, l in enumerate(lines): for i, l in enumerate(self._lines):
# check for dedents # check for dedents
m = re.match('^([\t ]*)(.?)', l) m = re.match('^([\t ]*)(.?)', l)
indent = len(m.group(1)) indent = len(m.group(1))
@@ -343,6 +343,12 @@ class FastParser(use_metaclass(CachedFastParser)):
p, node = self._get_parser(code_part, code[start:], p, node = self._get_parser(code_part, code[start:],
line_offset, nodes, not is_first) line_offset, nodes, not is_first)
# The actual used code_part is different from the given code
# part, because of docstrings for example there's a chance that
# splits are wrong.
used_lines = self._lines[line_offset:p.end_pos[0]]
code_part_actually_used = '\n'.join(used_lines)
if is_first and p.module.subscopes: if is_first and p.module.subscopes:
# special case, we cannot use a function subscope as a # special case, we cannot use a function subscope as a
# base scope, subscopes would save all the other contents # base scope, subscopes would save all the other contents
@@ -356,18 +362,18 @@ class FastParser(use_metaclass(CachedFastParser)):
if is_first: if is_first:
if self.current_node is None: if self.current_node is None:
self.current_node = ParserNode(p, code_part) self.current_node = ParserNode(p, code_part_actually_used)
else: else:
self.current_node.save_contents(p) self.current_node.save_contents(p)
else: else:
if node is None: if node is None:
self.current_node = \ self.current_node = \
self.current_node.add_parser(p, code_part) self.current_node.add_parser(p, code_part_actually_used)
else: else:
self.current_node = self.current_node.add_node(node) self.current_node = self.current_node.add_node(node)
if self.current_node.parent and (isinstance(p.user_scope, if self.current_node.parent and (isinstance(p.user_scope,
pr.SubModule) or p.user_scope is None) \ pr.SubModule) or p.user_scope is None) \
and self.user_position \ and self.user_position \
and p.start_pos <= self.user_position < p.end_pos: and p.start_pos <= self.user_position < p.end_pos:
p.user_scope = self.current_node.parent.content_scope p.user_scope = self.current_node.parent.content_scope
@@ -375,9 +381,8 @@ class FastParser(use_metaclass(CachedFastParser)):
self.parsers.append(p) self.parsers.append(p)
is_first = False is_first = False
else: #else:
# print '#'*45, line_offset, p.end_pos, 'theheck\n', code_part #print '#'*45, line_offset, p.end_pos, 'theheck\n', repr(code_part)
pass
line_offset += lines line_offset += lines
start += len(code_part) + 1 # +1 for newline start += len(code_part) + 1 # +1 for newline

3
test/test_fast_parser.py
View File

@@ -27,6 +27,9 @@ class Two(Abc):
def test_class_in_docstr(): def test_class_in_docstr():
"""
Regression test for a problem with classes in docstrings.
"""
a = '"\nclasses\n"' a = '"\nclasses\n"'
jedi.Script(a, 1, 0)._parser jedi.Script(a, 1, 0)._parser