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

Fix the issues that were changed by removing start_pos from the api classes.

Browse Source
This commit is contained in:
Dave Halter
2017-01-04 22:24:25 +01:00
parent e96fd32588
commit 9341df11bf
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/api/classes.py
View File

@@ -211,7 +211,7 @@ class BaseDefinition(object):
start_pos = self._name.start_pos start_pos = self._name.start_pos
if start_pos is None: if start_pos is None:
return None return None
return start_pos[0] return start_pos[1]
def docstring(self, raw=False, fast=True): def docstring(self, raw=False, fast=True):
r""" r"""
@@ -558,8 +558,9 @@ class Definition(BaseDefinition):
:rtype: list of Definition :rtype: list of Definition
""" """
defs = self._name.infer() defs = self._name.infer()
return _sort_names_by_start_pos( return sorted(
common.unite(defined_names(self._evaluator, d) for d in defs) common.unite(defined_names(self._evaluator, d) for d in defs),
key=lambda s: s._name.start_pos or (0, 0)
) )
def is_definition(self): def is_definition(self):

8
test/test_api/test_api.py
View File

@@ -177,18 +177,18 @@ def test_goto_assignments_follow_imports():
inspect.isfunction""") inspect.isfunction""")
definition, = api.Script(code, column=0).goto_assignments(follow_imports=True) definition, = api.Script(code, column=0).goto_assignments(follow_imports=True)
assert 'inspect.py' in definition.module_path assert 'inspect.py' in definition.module_path
assert definition.start_pos == (1, 0) assert (definition.line, definition.column) == (1, 0)
definition, = api.Script(code).goto_assignments(follow_imports=True) definition, = api.Script(code).goto_assignments(follow_imports=True)
assert 'inspect.py' in definition.module_path assert 'inspect.py' in definition.module_path
assert definition.start_pos > (1, 0) assert (definition.line, definition.column) > (1, 0)
code = '''def param(p): pass\nparam(1)''' code = '''def param(p): pass\nparam(1)'''
start_pos = 1, len('def param(') start_pos = 1, len('def param(')
script = api.Script(code, *start_pos) script = api.Script(code, *start_pos)
definition, = script.goto_assignments(follow_imports=True) definition, = script.goto_assignments(follow_imports=True)
assert definition.start_pos == start_pos assert (definition.line, definition.column) == start_pos
assert definition.name == 'p' assert definition.name == 'p'
result, = definition.goto_assignments() result, = definition.goto_assignments()
assert result.name == 'p' assert result.name == 'p'
@@ -198,4 +198,4 @@ def test_goto_assignments_follow_imports():
assert result.name == 'int' assert result.name == 'int'
definition, = script.goto_assignments() definition, = script.goto_assignments()
assert definition.start_pos == start_pos assert (definition.line, definition.column) == start_pos

2
test/test_api/test_classes.py
View File

@@ -272,7 +272,7 @@ class TestGotoAssignments(TestCase):
""" """
bar = names(dedent(src), references=True)[-1] bar = names(dedent(src), references=True)[-1]
param = bar.goto_assignments()[0] param = bar.goto_assignments()[0]
assert param.start_pos == (1, 13) assert (param.line, param.column) == (1, 13)
assert param.type == 'param' assert param.type == 'param'
def test_class_call(self): def test_class_call(self):

2
test/test_api/test_interpreter.py
View File

@@ -48,7 +48,7 @@ def test_nested_resolve():
cls = get_completion('XX', locals()) cls = get_completion('XX', locals())
func = get_completion('XX.x', locals()) func = get_completion('XX.x', locals())
assert func.start_pos == (cls.start_pos[0] + 1, 12) assert (func.line, func.column) == (cls.line + 1, 12)
def test_side_effect_completion(): def test_side_effect_completion():