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

Remove BaseDefinition._start_pos.

Browse Source
This commit is contained in:
Dave Halter
2014-09-11 01:21:08 +02:00
parent 283afa78f1
commit 71efb51f2a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi/api/classes.py
View File

@@ -62,9 +62,8 @@ class BaseDefinition(object):
'_sre.SRE_Pattern': 're.RegexObject', '_sre.SRE_Pattern': 're.RegexObject',
}.items()) }.items())
def __init__(self, evaluator, name, start_pos): def __init__(self, evaluator, name):
self._evaluator = evaluator self._evaluator = evaluator
self._start_pos = start_pos
self._name = name self._name = name
""" """
An instance of :class:`jedi.parsing_representation.Base` subclass. An instance of :class:`jedi.parsing_representation.Base` subclass.
@@ -98,7 +97,7 @@ class BaseDefinition(object):
.. todo:: Remove! .. todo:: Remove!
""" """
warnings.warn("Use line/column instead.", DeprecationWarning) warnings.warn("Use line/column instead.", DeprecationWarning)
return self._start_pos return self._name.start_pos
@property @property
def type(self): def type(self):
@@ -219,14 +218,14 @@ class BaseDefinition(object):
"""The line where the definition occurs (starting with 1).""" """The line where the definition occurs (starting with 1)."""
if self.in_builtin_module(): if self.in_builtin_module():
return None return None
return self._start_pos[0] return self._name.start_pos[0]
@property @property
def column(self): def column(self):
"""The column where the definition occurs (starting with 0).""" """The column where the definition occurs (starting with 0)."""
if self.in_builtin_module(): if self.in_builtin_module():
return None return None
return self._start_pos[1] return self._name.start_pos[1]
def docstring(self, raw=False): def docstring(self, raw=False):
r""" r"""
@@ -406,7 +405,7 @@ class Completion(BaseDefinition):
provide additional information about a completion. provide additional information about a completion.
""" """
def __init__(self, evaluator, name, needs_dot, like_name_length, base): def __init__(self, evaluator, name, needs_dot, like_name_length, base):
super(Completion, self).__init__(evaluator, name, name.start_pos) super(Completion, self).__init__(evaluator, name)
self._needs_dot = needs_dot self._needs_dot = needs_dot
self._like_name_length = like_name_length self._like_name_length = like_name_length
@@ -563,7 +562,7 @@ class Definition(use_metaclass(CachedMetaClass, BaseDefinition)):
or :meth:`api.Script.goto_definitions`. or :meth:`api.Script.goto_definitions`.
""" """
def __init__(self, evaluator, definition): def __init__(self, evaluator, definition):
super(Definition, self).__init__(evaluator, definition, definition.start_pos) super(Definition, self).__init__(evaluator, definition)
@property @property
def description(self): def description(self):
@@ -659,7 +658,7 @@ class Definition(use_metaclass(CachedMetaClass, BaseDefinition)):
return True return True
def __eq__(self, other): def __eq__(self, other):
return self._start_pos == other._start_pos \ return self._name.start_pos == other._name.start_pos \
and self.module_path == other.module_path \ and self.module_path == other.module_path \
and self.name == other.name \ and self.name == other.name \
and self._evaluator == other._evaluator and self._evaluator == other._evaluator
@@ -668,7 +667,7 @@ class Definition(use_metaclass(CachedMetaClass, BaseDefinition)):
return not self.__eq__(other) return not self.__eq__(other)
def __hash__(self): def __hash__(self):
return hash((self._start_pos, self.module_path, self.name, self._evaluator)) return hash((self._name.start_pos, self.module_path, self.name, self._evaluator))
class CallSignature(Definition): class CallSignature(Definition):