VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 22:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix another position problem with the reverse tokenizer. includes tests.

Browse Source
This commit is contained in:
David Halter
2013-07-28 21:19:03 +02:00
parent 8598fe7327
commit 1ed94060df
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jedi/modules.py
View File

@@ -122,17 +122,17 @@ class ModuleWithCursor(Module):
def get_path_until_cursor(self): def get_path_until_cursor(self):
""" Get the path under the cursor. """ """ Get the path under the cursor. """
result = self._get_path_until_cursor() result = self._get_path_until_cursor()
self._start_cursor_pos = self._last_tok_line, self._column_temp self._start_cursor_pos = self._start_cursor_pos_temp
return result return result
def _get_path_until_cursor(self, start_pos=None): def _get_path_until_cursor(self, start_pos=None):
def fetch_line(): def fetch_line():
line = self.get_line(self._line_temp)
if self._is_first: if self._is_first:
self._is_first = False self._is_first = False
self._line_length = self._column_temp self._line_length = self._column_temp
line = line[:self._column_temp] line = self._first_line
else: else:
line = self.get_line(self._line_temp)
self._line_length = len(line) self._line_length = len(line)
line = line + '\n' line = line + '\n'
# add lines with a backslash at the end # add lines with a backslash at the end
@@ -149,7 +149,8 @@ class ModuleWithCursor(Module):
self._is_first = True self._is_first = True
self._line_temp, self._column_temp = start_pos or self.position self._line_temp, self._column_temp = start_pos or self.position
self._last_tok_line = self.position[0] self._first_line = self.get_line(self._line_temp)[:self._column_temp]
self._start_cursor_pos_temp = self.position
open_brackets = ['(', '[', '{'] open_brackets = ['(', '[', '{']
close_brackets = [')', ']', '}'] close_brackets = [')', ']', '}']
@@ -189,7 +190,10 @@ class ModuleWithCursor(Module):
self._column_temp = self._line_length - end[1] self._column_temp = self._line_length - end[1]
break break
self._last_tok_line = self.position[0] - end[0] + 1 x = self.position[0] - end[0] + 1
l = self.get_line(x)
l = self._first_line if x == self.position[0] else l
self._start_cursor_pos_temp = x, len(l) - end[1]
self._column_temp = self._line_length - end[1] self._column_temp = self._line_length - end[1]
string += tok string += tok
last_type = token_type last_type = token_type
@@ -236,7 +240,7 @@ class ModuleWithCursor(Module):
if not self._line_cache: if not self._line_cache:
self._line_cache = self.source.splitlines() self._line_cache = self.source.splitlines()
if not self.source: # ''.splitlines() == [] if not self.source: # ''.splitlines() == []
self._line_cache = [self.source] self._line_cache = ['']
if line_nr == 0: if line_nr == 0:
# This is a fix for the zeroth line. We need a newline there, for # This is a fix for the zeroth line. We need a newline there, for

4
test/test_regression.py
View File

@@ -425,6 +425,10 @@ class TestRegression(TestBase):
[1, 2, 3, 4, 5, 6, 7, 8, 9, x] # <-- here [1, 2, 3, 4, 5, 6, 7, 8, 9, x] # <-- here
""", '] # <-- here', ['int']) """, '] # <-- here', ['int'])
# completion in whitespace
s = 'asdfxyxxxxxxxx sds\\\n hello'
assert self.goto_assignments(s, (2, 4)) == []
def test_backslash_continuation_and_bracket(self): def test_backslash_continuation_and_bracket(self):
self.check_definition_by_marker(r""" self.check_definition_by_marker(r"""
x = 0 x = 0