VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-25 01:38:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

the parser in general now cares for carriage return/new line combinations

Browse Source
This commit is contained in:
Dave Halter
2014-05-04 12:32:02 +02:00
parent f64b309ff0
commit fcd8b25d3d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/imports.py
-1
View File
@@ -408,7 +408,6 @@ class _Importer(object):
path += '/__init__.py' path += '/__init__.py'
with open(path, 'rb') as f: with open(path, 'rb') as f:
source = f.read() source = f.read()
source = source.replace(b'\n', b'\r\n')
else: else:
source = current_namespace[0].read() source = current_namespace[0].read()
current_namespace[0].close() current_namespace[0].close()
jedi/parser/__init__.py
+5 -5
View File
@@ -146,7 +146,7 @@ class Parser(object):
""" """
imports = [] imports = []
brackets = False brackets = False
continue_kw = [",", ";", "\n", ')'] \ continue_kw = [",", ";", "\n", '\r\n', ')'] \
+ list(set(keyword.kwlist) - set(['as'])) + list(set(keyword.kwlist) - set(['as']))
while True: while True:
defunct = False defunct = False
@@ -154,7 +154,7 @@ class Parser(object):
if tok.string == '(': # python allows only one `(` in the statement. if tok.string == '(': # python allows only one `(` in the statement.
brackets = True brackets = True
tok = next(self._gen) tok = next(self._gen)
if brackets and tok.string == '\n': if brackets and tok.type == tokenize.NEWLINE:
tok = next(self._gen) tok = next(self._gen)
i, tok = self._parse_dot_name(tok) i, tok = self._parse_dot_name(tok)
if not i: if not i:
@@ -165,7 +165,7 @@ class Parser(object):
imports.append((i, name2, defunct)) imports.append((i, name2, defunct))
while tok.string not in continue_kw: while tok.string not in continue_kw:
tok = next(self._gen) tok = next(self._gen)
if not (tok.string == "," or brackets and tok.string == '\n'): if not (tok.string == "," or brackets and tok.type == tokenize.NEWLINE):
break break
return imports return imports
@@ -302,7 +302,7 @@ class Parser(object):
# will even break in parentheses. This is true for typical flow # will even break in parentheses. This is true for typical flow
# commands like def and class and the imports, which will never be used # commands like def and class and the imports, which will never be used
# in a statement. # in a statement.
breaks = set(['\n', ':', ')']) breaks = set(['\n', '\r\n', ':', ')'])
always_break = [';', 'import', 'from', 'class', 'def', 'try', 'except', always_break = [';', 'import', 'from', 'class', 'def', 'try', 'except',
'finally', 'while', 'return', 'yield'] 'finally', 'while', 'return', 'yield']
not_first_break = ['del', 'raise'] not_first_break = ['del', 'raise']
@@ -515,7 +515,7 @@ class Parser(object):
# multiple inputs because of with # multiple inputs because of with
inputs = [] inputs = []
first = True first = True
while first or command == 'with' and tok.string not in (':', '\n'): while first or command == 'with' and tok.string not in (':', '\n', '\r\n'):
statement, tok = \ statement, tok = \
self._parse_statement(added_breaks=added_breaks) self._parse_statement(added_breaks=added_breaks)
if command == 'except' and tok.string == ',': if command == 'except' and tok.string == ',':