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

Fix f-string evaluation, fixes #1248

Browse Source
This commit is contained in:
Dave Halter
2018-12-23 15:32:22 +01:00
parent 86fbf3fef6
commit 5e7ff808d4
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/syntax_tree.py
View File

@@ -69,7 +69,7 @@ def eval_node(context, element):
debug.dbg('eval_node %s@%s in %s', element, element.start_pos, context) debug.dbg('eval_node %s@%s in %s', element, element.start_pos, context)
evaluator = context.evaluator evaluator = context.evaluator
typ = element.type typ = element.type
if typ in ('name', 'number', 'string', 'atom', 'strings', 'keyword'): if typ in ('name', 'number', 'string', 'atom', 'strings', 'keyword', 'fstring'):
return eval_atom(context, element) return eval_atom(context, element)
elif typ == 'lambdef': elif typ == 'lambdef':
return ContextSet([FunctionContext.from_context(context, element)]) return ContextSet([FunctionContext.from_context(context, element)])
@@ -221,6 +221,8 @@ def eval_atom(context, atom):
right = eval_atom(context, string) right = eval_atom(context, string)
context_set = _eval_comparison(context.evaluator, context, context_set, u'+', right) context_set = _eval_comparison(context.evaluator, context, context_set, u'+', right)
return context_set return context_set
elif atom.type == 'fstring':
return compiled.get_string_context_set(context.evaluator)
else: else:
c = atom.children c = atom.children
# Parentheses without commas are not tuples. # Parentheses without commas are not tuples.

4
test/completion/fstring.py
View File

@@ -32,3 +32,7 @@ f'xyz'.uppe
#? 3 [] #? 3 []
f'f' f'f'
# Github #1248
#? int()
{"foo": 1}[f"foo"]