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

Handle backslash escaping.

Browse Source
This commit is contained in:
Dave Halter
2015-02-18 17:32:34 +01:00
parent 595da50ab8
commit 39bf9f426b
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jedi/parser/fast.py
View File

@@ -280,13 +280,22 @@ class FastParser(use_metaclass(CachedFastParser)):
new_indent = False new_indent = False
parentheses_level = 0 parentheses_level = 0
flow_indent = None flow_indent = None
previous_line = None
# All things within flows are simply being ignored. # All things within flows are simply being ignored.
for i, l in enumerate(self._lines): for i, l in enumerate(self._lines):
# Handle backslash newline escaping.
if l.endswith('\\\n') or l.endswith('\\\r\n'):
previous_line = l
continue
if previous_line is not None:
l = previous_line + l
previous_line = None
# check for dedents # check for dedents
s = l.lstrip('\t \n\r') s = l.lstrip('\t \n\r')
indent = len(l) - len(s) indent = len(l) - len(s)
if not s or s[0] == '#': if not s or s[0] == '#':
current_lines.append(l) # just ignore comments and blank lines current_lines.append(l) # Just ignore comments and blank lines
continue continue
if new_indent: if new_indent:
@@ -379,8 +388,6 @@ class FastParser(use_metaclass(CachedFastParser)):
% (self.module_path, self.number_parsers_used, % (self.module_path, self.number_parsers_used,
self.number_of_splits)) self.number_of_splits))
# print(self.parsers[0].module.get_code())
def _get_node(self, source, parser_code, line_offset, nodes, no_docstr): def _get_node(self, source, parser_code, line_offset, nodes, no_docstr):
""" """
Side effect: Alters the list of nodes. Side effect: Alters the list of nodes.

1
jedi/parser/tokenize.py
View File

@@ -265,6 +265,7 @@ def generate_tokens(readline):
break break
yield NAME, token, spos, prefix yield NAME, token, spos, prefix
elif initial == '\\' and line[start:] == '\\\n': # continued stmt elif initial == '\\' and line[start:] == '\\\n': # continued stmt
additional_prefix += line[start:]
continue continue
else: else:
if token in '([{': if token in '([{':

17
test/test_parser/test_fast_parser.py
View File

@@ -329,12 +329,11 @@ def test_open_parentheses():
# get_code, because it isn't valid code. # get_code, because it isn't valid code.
assert p.module.get_code() == '\n' + func assert p.module.get_code() == '\n' + func
assert p.number_of_splits == 2 assert p.number_of_splits == 2
# CAVEAT: There are multiple splits, but because of the open parentheses,
# we just use one parser. We could theoretically break at the `def`,
# however that would require to also break properly at flow level. That is
# not possible because of ternary statements and would lead to strange
# behavior without much more knowledge. So we just keep it this way.
assert p.number_parsers_used == 2 assert p.number_parsers_used == 2
cache.save_parser(None, None, p, pickling=False)
# Now with a correct parser it should work perfectly well.
check_fp('isinstance()\n' + func, 1)
def test_strange_parentheses(): def test_strange_parentheses():
@@ -349,7 +348,7 @@ def test_strange_parentheses():
def test_backslash(): def test_backslash():
src = dedent("""\ src = dedent(r"""
a = 1\ a = 1\
if 1 else 2 if 1 else 2
def x(): def x():
@@ -357,8 +356,8 @@ def test_backslash():
""") """)
check_fp(src, 2) check_fp(src, 2)
src = dedent("""\ src = dedent(r"""
if 2: def x():
a = 1\ a = 1\
if 1 else 2 if 1 else 2
def y(): def y():
@@ -366,7 +365,7 @@ def test_backslash():
""") """)
# The dangling if leads to not splitting where we theoretically could # The dangling if leads to not splitting where we theoretically could
# split. # split.
check_fp(src, 1) check_fp(src, 2)
def test_incomplete_function(): def test_incomplete_function():