From 47d6ae3da1c583afee09645371ea34b67c9a0b83 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 4 Sep 2019 01:13:43 +0200 Subject: [PATCH] SimpleParamName -> AnonymousParamName --- jedi/api/__init__.py | 4 ++-- jedi/inference/arguments.py | 4 ++-- jedi/inference/context.py | 4 ++-- jedi/inference/filters.py | 4 ++-- jedi/inference/names.py | 12 ++++++------ jedi/inference/value/function.py | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 660716aa..ce319750 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -34,7 +34,7 @@ from jedi.inference import usages from jedi.inference.arguments import try_iter_content from jedi.inference.helpers import get_module_names, infer_call_of_leaf from jedi.inference.sys_path import transform_path_to_dotted -from jedi.inference.names import TreeNameDefinition, SimpleParamName +from jedi.inference.names import TreeNameDefinition, AnonymousParamName from jedi.inference.syntax_tree import tree_name_to_values from jedi.inference.value import ModuleValue from jedi.inference.base_value import ValueSet @@ -508,7 +508,7 @@ def names(source=None, path=None, encoding='utf-8', all_scopes=False, if name.parent.type == 'param': func = tree.search_ancestor(name, 'funcdef', 'lambdef') func = context.get_root_context().create_value(func) - return SimpleParamName(func, name) + return AnonymousParamName(func, name) else: return TreeNameDefinition(context, name) diff --git a/jedi/inference/arguments.py b/jedi/inference/arguments.py index 865ae855..f4cda625 100644 --- a/jedi/inference/arguments.py +++ b/jedi/inference/arguments.py @@ -8,7 +8,7 @@ from jedi.inference.utils import PushBackIterator from jedi.inference import analysis from jedi.inference.lazy_value import LazyKnownValue, LazyKnownValues, \ LazyTreeValue, get_merged_lazy_value -from jedi.inference.names import ParamName, TreeNameDefinition, SimpleParamName +from jedi.inference.names import ParamName, TreeNameDefinition, AnonymousParamName from jedi.inference.base_value import NO_VALUES, ValueSet, ContextualizedNode from jedi.inference.value import iterable from jedi.inference.cache import inference_state_as_method_param_cache @@ -270,7 +270,7 @@ class TreeArguments(AbstractArguments): names = calling_name.goto() if len(names) != 1: break - if isinstance(names[0], SimpleParamName): + if isinstance(names[0], AnonymousParamName): # Dynamic parameters should not have calling nodes, because # they are dynamic and extremely random. return [] diff --git a/jedi/inference/context.py b/jedi/inference/context.py index 45f5fd2b..cd4e717b 100644 --- a/jedi/inference/context.py +++ b/jedi/inference/context.py @@ -6,7 +6,7 @@ from parso.python.tree import Name from jedi.inference.filters import ParserTreeFilter, MergedFilter, \ GlobalNameFilter -from jedi.inference.names import SimpleParamName, TreeNameDefinition +from jedi.inference.names import AnonymousParamName, TreeNameDefinition from jedi.inference.base_value import NO_VALUES, ValueSet from jedi.parser_utils import get_parent_scope from jedi import debug @@ -277,7 +277,7 @@ class TreeContextMixin(object): if definition and definition.type == 'param' and definition.name == tree_name: funcdef = search_ancestor(definition, 'funcdef', 'lambdef') func = self.create_value(funcdef) - return SimpleParamName(func, tree_name) + return AnonymousParamName(func, tree_name) else: context = self.create_context(tree_name) return TreeNameDefinition(context, tree_name) diff --git a/jedi/inference/filters.py b/jedi/inference/filters.py index 76f4b35b..9001484b 100644 --- a/jedi/inference/filters.py +++ b/jedi/inference/filters.py @@ -14,7 +14,7 @@ from jedi.inference.base_value import ValueSet, Value, ValueWrapper, \ from jedi.parser_utils import get_cached_parent_scope from jedi.inference.utils import to_list from jedi.inference.names import TreeNameDefinition, ParamName, \ - SimpleParamName, AbstractNameDefinition + AnonymousParamName, AbstractNameDefinition _definition_name_cache = weakref.WeakKeyDictionary() @@ -179,7 +179,7 @@ class FunctionExecutionFilter(_FunctionExecutionFilter): class AnonymousFunctionExecutionFilter(_FunctionExecutionFilter): def _convert_param(self, param, name): - return SimpleParamName(self._function_value, name) + return AnonymousParamName(self._function_value, name) class GlobalNameFilter(AbstractUsedNamesFilter): diff --git a/jedi/inference/names.py b/jedi/inference/names.py index 6b923bf6..eb4ad6b5 100644 --- a/jedi/inference/names.py +++ b/jedi/inference/names.py @@ -254,9 +254,9 @@ class BaseTreeParamName(ParamNameInterface, AbstractTreeName): return [self] -class X(BaseTreeParamName): +class _ActualTreeParamName(BaseTreeParamName): def __init__(self, function_value, tree_name): - super(BaseTreeParamName, self).__init__( + super(_ActualTreeParamName, self).__init__( function_value.get_default_param_context(), tree_name) self.function_value = function_value @@ -323,12 +323,12 @@ class X(BaseTreeParamName): return doc_params -class SimpleParamName(X): +class AnonymousParamName(_ActualTreeParamName): def __init__(self, function_value, tree_name): - super(SimpleParamName, self).__init__(function_value, tree_name) + super(AnonymousParamName, self).__init__(function_value, tree_name) def infer(self): - values = super(SimpleParamName, self).infer() + values = super(AnonymousParamName, self).infer() if values: return values from jedi.inference.dynamic_params import dynamic_param_lookup @@ -350,7 +350,7 @@ class SimpleParamName(X): return ValueSet({value}) -class ParamName(X): +class ParamName(_ActualTreeParamName): def __init__(self, function_value, tree_name, arguments): super(ParamName, self).__init__(function_value, tree_name) self.arguments = arguments diff --git a/jedi/inference/value/function.py b/jedi/inference/value/function.py index c71b5b33..2dcb6059 100644 --- a/jedi/inference/value/function.py +++ b/jedi/inference/value/function.py @@ -11,7 +11,7 @@ from jedi.inference.signature import TreeSignature from jedi.inference.filters import ParserTreeFilter, FunctionExecutionFilter, \ AnonymousFunctionExecutionFilter from jedi.inference.names import ValueName, AbstractNameDefinition, \ - SimpleParamName, ParamName + AnonymousParamName, ParamName from jedi.inference.base_value import ContextualizedNode, NO_VALUES, \ ValueSet, TreeValue, ValueWrapper from jedi.inference.lazy_value import LazyKnownValues, LazyKnownValue, \ @@ -70,7 +70,7 @@ class FunctionMixin(object): return ValueSet([BoundMethod(instance, self)]) def get_param_names(self): - return [SimpleParamName(self, param.name) + return [AnonymousParamName(self, param.name) for param in self.tree_node.get_params()] @property