From 0f1570f682f58fdc7ffaf2d0d3bb069e94a20de4 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 30 Apr 2017 14:12:30 +0200 Subject: [PATCH] position_nr -> position_index --- jedi/evaluate/filters.py | 4 ++-- jedi/evaluate/param.py | 5 ----- jedi/parser/python/tree.py | 8 +++++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jedi/evaluate/filters.py b/jedi/evaluate/filters.py index 053c2412..3b9950a2 100644 --- a/jedi/evaluate/filters.py +++ b/jedi/evaluate/filters.py @@ -103,13 +103,13 @@ class ParamName(AbstractTreeName): def get_param(self): params = self.parent_context.get_params() param_node = search_ancestor(self.tree_name, 'param') - return params[param_node.position_nr] + return params[param_node.position_index] class AnonymousInstanceParamName(ParamName): def infer(self): param_node = search_ancestor(self.tree_name, 'param') - if param_node.position_nr == 0: + if param_node.position_index == 0: # This is a speed optimization, to return the self param (because # it's known). This only affects anonymous instances. return set([self.parent_context.instance]) diff --git a/jedi/evaluate/param.py b/jedi/evaluate/param.py index a2c09b5f..b09419ce 100644 --- a/jedi/evaluate/param.py +++ b/jedi/evaluate/param.py @@ -222,11 +222,6 @@ class ExecutedParam(object): return self._lazy_context.infer() - @property - def position_nr(self): - # Need to use the original logic here, because it uses the parent. - return self._param_node.position_nr - @property def var_args(self): return self._execution_context.var_args diff --git a/jedi/parser/python/tree.py b/jedi/parser/python/tree.py index aa489d94..e37e2b55 100644 --- a/jedi/parser/python/tree.py +++ b/jedi/parser/python/tree.py @@ -963,7 +963,10 @@ class Param(PythonBaseNode): return self._tfpdef() @property - def position_nr(self): + def position_index(self): + """ + Returns the positional index of a paramter. + """ index = self.parent.children.index(self) try: keyword_only_index = self.parent.children.index('*') @@ -975,6 +978,9 @@ class Param(PythonBaseNode): return index - 1 def get_parent_function(self): + """ + Returns the function/lambda a paramter is defined in. + """ return search_ancestor(self, ('funcdef', 'lambdef')) def get_description(self):