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

the fast parser was able to return wrong sub parsers, because the sometimes hashes were not updated, fixes #396.

Browse Source
This commit is contained in:
Dave Halter
2014-05-04 16:36:41 +02:00
parent 16fd7f5424
commit a4b9ccc2e7
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/parser/fast.py
View File

@@ -72,14 +72,14 @@ class CachedFastParser(type):
class ParserNode(object):
def __init__(self, parser, code, parent=None):
self.parent = parent
self.code = code
self.hash = hash(code)
self.children = []
# must be created before new things are added to it.
self.save_contents(parser)
self.save_contents(parser, code)
def save_contents(self, parser):
def save_contents(self, parser, code):
self.code = code
self.hash = hash(code)
self.parser = parser
try:
@@ -325,7 +325,7 @@ class FastParser(use_metaclass(CachedFastParser)):
if self.current_node is None:
self.current_node = ParserNode(new, '')
else:
self.current_node.save_contents(new)
self.current_node.save_contents(new, '')
self.parsers.append(new)
is_first = False
@@ -333,7 +333,7 @@ class FastParser(use_metaclass(CachedFastParser)):
if self.current_node is None:
self.current_node = ParserNode(p, code_part_actually_used)
else:
self.current_node.save_contents(p)
self.current_node.save_contents(p, code_part_actually_used)
else:
if node is None:
self.current_node = \