VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-25 01:38:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the typical ordering of arguments for ClassContext.

Browse Source
This commit is contained in:
Dave Halter
2017-09-27 19:16:05 +02:00
parent a7a66024d4
commit 9073f0debc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/__init__.py
+2 -2
View File
@@ -245,7 +245,7 @@ class Evaluator(object):
if def_ is not None: if def_ is not None:
type_ = def_.type type_ = def_.type
if type_ == 'classdef': if type_ == 'classdef':
return [er.ClassContext(self, name.parent, context)] return [er.ClassContext(self, context, name.parent)]
elif type_ == 'funcdef': elif type_ == 'funcdef':
return [er.FunctionContext(self, context, name.parent)] return [er.FunctionContext(self, context, name.parent)]
@@ -378,7 +378,7 @@ class Evaluator(object):
return func.get_function_execution() return func.get_function_execution()
return func return func
elif scope_node.type == 'classdef': elif scope_node.type == 'classdef':
class_context = er.ClassContext(self, scope_node, parent_context) class_context = er.ClassContext(self, parent_context, scope_node)
if child_is_funcdef: if child_is_funcdef:
# anonymous instance # anonymous instance
return AnonymousInstance(self, parent_context, class_context) return AnonymousInstance(self, parent_context, class_context)
jedi/evaluate/representation.py
+1 -1
View File
@@ -113,7 +113,7 @@ class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext)):
""" """
api_type = 'class' api_type = 'class'
def __init__(self, evaluator, classdef, parent_context): def __init__(self, evaluator, parent_context, classdef):
super(ClassContext, self).__init__(evaluator, parent_context=parent_context) super(ClassContext, self).__init__(evaluator, parent_context=parent_context)
self.tree_node = classdef self.tree_node = classdef