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

Finally passing all diff parser tests.

Browse Source
This commit is contained in:
Dave Halter
2016-09-15 01:26:28 +02:00
parent 8132055428
commit 74058fbf28
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/parser/fast.py
View File

@@ -58,9 +58,9 @@ def suite_or_file_input_is_valid(grammar, stack):
return False return False
for dfa, newstate, (symbol_number, nodes) in reversed(stack): for dfa, newstate, (symbol_number, nodes) in reversed(stack):
if symbol_number == grammar.symbol2number['suite']: if grammar.number2symbol[symbol_number] == 'suite':
# If we don't have nodes already, the suite is not valid. # If only newline is in the suite, the suite is not valid, yet.
return bool(nodes) return len(nodes) > 1
# Not reaching a suite means that we're dealing with file_input levels # Not reaching a suite means that we're dealing with file_input levels
# where there's no need for a valid statement in it. It can also be empty. # where there's no need for a valid statement in it. It can also be empty.
return True return True

6
test/test_parser/test_diff_parser.py
View File

@@ -200,7 +200,7 @@ def test_for_on_one_line(differ):
""") """)
# The second parser is for parsing the `def nested()` which is an `equal` # The second parser is for parsing the `def nested()` which is an `equal`
# operation in the SequenceMatcher. # operation in the SequenceMatcher.
differ.parse(src, parsers=2, copies=1) differ.parse(src, parsers=1, copies=1)
def test_open_parentheses(differ): def test_open_parentheses(differ):
@@ -208,7 +208,7 @@ def test_open_parentheses(differ):
code = u('isinstance(\n\n' + func) code = u('isinstance(\n\n' + func)
differ.initialize(code) differ.initialize(code)
differ.parse('isinstance(\n' + func, copies=1, parsers=1) differ.parse('isinstance(\n' + func, parsers=1, allow_error_leafs=True)
def test_backslash(differ): def test_backslash(differ):
@@ -238,4 +238,4 @@ def test_backslash(differ):
def second(): def second():
pass pass
""") """)
differ.parse(src, parsers=2) differ.parse(src, parsers=1)