mirror of
https://github.com/davidhalter/jedi.git
synced 2025-12-10 15:51:51 +08:00
fixed position problems (with tokenizer offsets)
This commit is contained in:
@@ -63,6 +63,7 @@ class NoErrorTokenizer(object):
|
|||||||
self.stop_on_scope = stop_on_scope
|
self.stop_on_scope = stop_on_scope
|
||||||
self.first_scope = False
|
self.first_scope = False
|
||||||
self.closed = False
|
self.closed = False
|
||||||
|
self.first = True
|
||||||
|
|
||||||
def push_last_back(self):
|
def push_last_back(self):
|
||||||
self.gen.push_back(self.current)
|
self.gen.push_back(self.current)
|
||||||
@@ -107,8 +108,13 @@ class NoErrorTokenizer(object):
|
|||||||
elif c[1] != '@':
|
elif c[1] != '@':
|
||||||
self.first_scope = True
|
self.first_scope = True
|
||||||
|
|
||||||
|
if self.first:
|
||||||
c[2] = self.offset[0] + c[2][0], self.offset[1] + c[2][1]
|
c[2] = self.offset[0] + c[2][0], self.offset[1] + c[2][1]
|
||||||
c[3] = self.offset[0] + c[3][0], self.offset[1] + c[3][1]
|
c[3] = self.offset[0] + c[3][0], self.offset[1] + c[3][1]
|
||||||
|
self.first = False
|
||||||
|
else:
|
||||||
|
c[2] = self.offset[0] + c[2][0], c[2][1]
|
||||||
|
c[3] = self.offset[0] + c[3][0], c[3][1]
|
||||||
return c
|
return c
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ class Simple(Base):
|
|||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
code = self.get_code().replace('\n', ' ')
|
code = self.get_code().replace('\n', ' ')
|
||||||
# TODO (this todo doesn't belong here) positions are not added right.
|
|
||||||
return "<%s: %s@%s,%s>" % \
|
return "<%s: %s@%s,%s>" % \
|
||||||
(type(self).__name__, code, self.start_pos[0], self.start_pos[1])
|
(type(self).__name__, code, self.start_pos[0], self.start_pos[1])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user