From 84041073971b1b98d14775473f526460c57fc2b5 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 4 May 2014 02:14:34 +0200 Subject: [PATCH] carriage return issues fixed in the fast parser -> fixes #402 --- jedi/parser/fast.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jedi/parser/fast.py b/jedi/parser/fast.py index 054343b2..6972dcb3 100644 --- a/jedi/parser/fast.py +++ b/jedi/parser/fast.py @@ -166,7 +166,7 @@ class ParserNode(object): """Adding a node means adding a node that was already added earlier""" self.children.append(node) self._set_items(node.parser, set_parent=set_parent) - node.old_children = node.children # TODO potential memory leak? + node.old_children = node.children # TODO potential memory leak? node.children = [] scope = self.content_scope @@ -226,7 +226,9 @@ class FastParser(use_metaclass(CachedFastParser)): r_keyword = '^[ \t]*(def|class|@|%s)' % '|'.join(tokenize.FLOWS) - self._lines = code.splitlines() + # Split only new lines. Distinction between \r\n is the tokenizer's + # job. + self._lines = code.split('\n') current_lines = [] parts = [] is_decorator = False