From a4bd4128014d1dbc46b675672a0fa6a5f2a60cc0 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 2 Feb 2015 02:29:39 +0100 Subject: [PATCH] Fix an issue with the positions of InstanceNames that used the original position_modifier. --- jedi/evaluate/representation.py | 2 +- jedi/parser/tree.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index 9463020c..f531370a 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -260,7 +260,7 @@ class LazyInstanceDict(object): class InstanceName(pr.Name): def __init__(self, origin_name, parent): - super(InstanceName, self).__init__(origin_name.position_modifier, + super(InstanceName, self).__init__(pr.zero_position_modifier, origin_name.value, origin_name.start_pos) self._origin_name = origin_name diff --git a/jedi/parser/tree.py b/jedi/parser/tree.py index 9f21b66f..fdb24aec 100644 --- a/jedi/parser/tree.py +++ b/jedi/parser/tree.py @@ -158,9 +158,7 @@ class Leaf(Base): @start_pos.setter def start_pos(self, value): - # TODO I think this is wrong, because the position_modifier.line needs - # to be looked at as well. Probably it needs to be substracted. - self._start_pos = value + self._start_pos = value[0] - self.position_modifier.line, value[1] @property def end_pos(self):