VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Use PythonNode and not Node in the evaluator.

Browse Source
This commit is contained in:
Dave Halter
2017-04-01 17:39:28 +02:00
parent 281d6a87a0
commit 4cc467123c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/evaluate/compiled/fake.py
View File

@@ -10,7 +10,7 @@ import types
from jedi._compatibility import is_py3, builtins, unicode, is_py34 from jedi._compatibility import is_py3, builtins, unicode, is_py34
from jedi.parser.python import parse from jedi.parser.python import parse
from jedi.parser.python import tree as pt from jedi.parser.python import tree
modules = {} modules = {}
@@ -180,9 +180,9 @@ def _get_faked(module, obj, name=None):
assert result.type == 'funcdef' assert result.type == 'funcdef'
doc = '"""%s"""' % obj.__doc__ # TODO need escapes. doc = '"""%s"""' % obj.__doc__ # TODO need escapes.
suite = result.children[-1] suite = result.children[-1]
string = pt.String(doc, (0, 0), '') string = tree.String(doc, (0, 0), '')
new_line = pt.Newline('\n', (0, 0)) new_line = tree.Newline('\n', (0, 0))
docstr_node = pt.Node('simple_stmt', [string, new_line]) docstr_node = tree.PythonNode('simple_stmt', [string, new_line])
suite.children.insert(1, docstr_node) suite.children.insert(1, docstr_node)
return result, fake_module return result, fake_module

2
jedi/evaluate/finder.py
View File

@@ -242,7 +242,7 @@ def _apply_decorators(evaluator, context, node):
trailer_nodes = dec.children[2:-1] trailer_nodes = dec.children[2:-1]
if trailer_nodes: if trailer_nodes:
# Create a trailer and evaluate it. # Create a trailer and evaluate it.
trailer = tree.Node('trailer', trailer_nodes) trailer = tree.PythonNode('trailer', trailer_nodes)
trailer.parent = dec trailer.parent = dec
dec_values = evaluator.eval_trailer(context, dec_values, trailer) dec_values = evaluator.eval_trailer(context, dec_values, trailer)

2
jedi/parser/python/diff.py
View File

@@ -230,8 +230,6 @@ class DiffParser(object):
leaf = leaf.get_next_leaf() leaf = leaf.get_next_leaf()
if leaf.get_start_pos_of_prefix()[0] == old_line: if leaf.get_start_pos_of_prefix()[0] == old_line:
node = leaf node = leaf
# TODO use leaf.get_definition one day when that one is working
# well.
while node.parent.type not in ('file_input', 'suite'): while node.parent.type not in ('file_input', 'suite'):
node = node.parent node = node.parent
return node return node