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

Small test changes.

Browse Source
This commit is contained in:
Dave Halter
2016-09-15 09:37:35 +02:00
parent 74058fbf28
commit ed71d05ed7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jedi/parser/fast.py
View File

@@ -184,7 +184,6 @@ class DiffParser(object):
else: else:
last_line = last_leaf.end_pos[0] last_line = last_leaf.end_pos[0]
print('test', last_line, until_line_old, node)
if last_line > until_line_old: if last_line > until_line_old:
divided_node = self._divide_node(node, until_line_old) divided_node = self._divide_node(node, until_line_old)
print('divided', divided_node) print('divided', divided_node)

21
test/test_parser/test_diff_parser.py
View File

@@ -55,16 +55,13 @@ def _check_error_leaves_nodes(node):
class Differ(object): class Differ(object):
def __init__(self):
self._first_use = True
def initialize(self, source): def initialize(self, source):
debug.dbg('differ: initialize', color='YELLOW') debug.dbg('differ: initialize', color='YELLOW')
grammar = load_grammar() grammar = load_grammar()
self.parser = ParserWithRecovery(grammar, source) self.parser = ParserWithRecovery(grammar, source)
return self.parser.module return self.parser.module
def parse(self, source, copies=0, parsers=0, allow_error_leafs=False): def parse(self, source, copies=0, parsers=0, expect_error_leafs=False):
debug.dbg('differ: parse copies=%s parsers=%s', copies, parsers, color='YELLOW') debug.dbg('differ: parse copies=%s parsers=%s', copies, parsers, color='YELLOW')
lines = splitlines(source, keepends=True) lines = splitlines(source, keepends=True)
diff_parser = DiffParser(self.parser) diff_parser = DiffParser(self.parser)
@@ -74,8 +71,7 @@ class Differ(object):
assert diff_parser._parser_count == parsers assert diff_parser._parser_count == parsers
self.parser.module = new_module self.parser.module = new_module
self.parser._parsed = new_module self.parser._parsed = new_module
if not allow_error_leafs: assert expect_error_leafs == _check_error_leaves_nodes(new_module)
assert not _check_error_leaves_nodes(new_module)
return new_module return new_module
@@ -142,7 +138,7 @@ def test_if_simple(differ):
differ.initialize(src + 'a') differ.initialize(src + 'a')
differ.parse(src + else_ + "a", copies=0, parsers=1) differ.parse(src + else_ + "a", copies=0, parsers=1)
differ.parse(else_, parsers=1, allow_error_leafs=True) differ.parse(else_, parsers=1, expect_error_leafs=True)
differ.parse(src + else_, parsers=1) differ.parse(src + else_, parsers=1)
@@ -205,10 +201,17 @@ def test_for_on_one_line(differ):
def test_open_parentheses(differ): def test_open_parentheses(differ):
func = 'def func():\n a' func = 'def func():\n a'
code = u('isinstance(\n\n' + func) code = 'isinstance(\n\n' + func
new_code = 'isinstance(\n' + func
differ.initialize(code) differ.initialize(code)
differ.parse('isinstance(\n' + func, parsers=1, allow_error_leafs=True) differ.parse(new_code, parsers=1, expect_error_leafs=True)
new_code = 'a = 1\n' + new_code
differ.parse(new_code, parsers=2, expect_error_leafs=True)
differ.initialize(new_code)
differ.parse('isinstance()\n' + func, parsers=2, copies=0)
def test_backslash(differ): def test_backslash(differ):