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

Fix more issues with where contexts are used and where values are used

Browse Source
This commit is contained in:
Dave Halter
2019-08-20 09:59:10 +02:00
parent 39b294e085
commit 14fc5ed289
7 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/api/file_name.py
View File

@@ -77,15 +77,15 @@ def _get_string_additions(module_context, start_leaf):
addition = start_leaf.get_previous_leaf()
if addition != '+':
return ''
value = module_context.create_context(start_leaf)
return _add_strings(value, reversed(list(iterate_nodes())))
context = module_context.create_context(start_leaf)
return _add_strings(context, reversed(list(iterate_nodes())))
def _add_strings(value, nodes, add_slash=False):
def _add_strings(context, nodes, add_slash=False):
string = ''
first = True
for child_node in nodes:
values = value.infer_node(child_node)
values = context.infer_node(child_node)
if len(values) != 1:
return None
c, = values
@@ -111,8 +111,8 @@ def _add_os_path_join(module_context, start_leaf, bracket_start):
if not nodes:
return ''
value = module_context.create_context(nodes[0])
return _add_strings(value, nodes, add_slash=True) or ''
context = module_context.create_context(nodes[0])
return _add_strings(context, nodes, add_slash=True) or ''
if start_leaf.type == 'error_leaf':
# Unfinished string literal, like `join('`