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

Fix some newline issues in the backwards tokenizer.

Browse Source
This commit is contained in:
Dave Halter
2014-12-17 14:56:46 +01:00
parent 6eb2af301d
commit f164dd8892
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/parser/user_context.py
View File

@@ -36,18 +36,13 @@ class UserContext(object):
first_line = self.get_line(self._line_temp)[:self._column_temp] first_line = self.get_line(self._line_temp)[:self._column_temp]
self._line_length = self._column_temp self._line_length = self._column_temp
yield first_line[::-1] yield first_line[::-1] + '\n'
while True: while True:
self._line_temp -= 1 self._line_temp -= 1
line = self.get_line(self._line_temp) line = self.get_line(self._line_temp)
if False and last_line and last_line[-1] == '\\':
# Add lines with a backslash at the end.
line = last_line[:-1] + ' ' + line
self._line_length = len(last_line)
else:
self._line_length = len(line) self._line_length = len(line)
yield '\n' + line[::-1] yield line[::-1] + '\n'
def _get_backwards_tokenizer(self, start_pos): def _get_backwards_tokenizer(self, start_pos):
gen = self._backwards_line_generator(start_pos) gen = self._backwards_line_generator(start_pos)
@@ -159,6 +154,8 @@ class UserContext(object):
next_is_key = False next_is_key = False
key_name = None key_name = None
for tok_type, tok_str, start_pos, prefix in self._get_backwards_tokenizer(self.position): for tok_type, tok_str, start_pos, prefix in self._get_backwards_tokenizer(self.position):
# TODO improve the speed by not tokenizing everything.
# def/class/import stops the process.
if next_must_be_name: if next_must_be_name:
if tok_type == tokenize.NAME: if tok_type == tokenize.NAME:
call, _ = self._calc_path_until_cursor(start_pos=pos) call, _ = self._calc_path_until_cursor(start_pos=pos)