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

Fix an issue with f-strings, fixes #1224

Browse Source
This commit is contained in:
Dave Halter
2018-09-30 13:26:54 +02:00
parent 4545d91929
commit 6a2a2a9fa1
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/api/helpers.py
View File

@@ -105,14 +105,17 @@ def get_stack_at_position(grammar, code_lines, module_node, pos):
# TODO This is for now not an official parso API that exists purely # TODO This is for now not an official parso API that exists purely
# for Jedi. # for Jedi.
tokens = grammar._tokenize(code) tokens = grammar._tokenize(code)
for token_ in tokens: for token in tokens:
if token_.string == safeword: if token.string == safeword:
raise EndMarkerReached() raise EndMarkerReached()
elif token_.prefix.endswith(safeword): elif token.prefix.endswith(safeword):
# This happens with comments. # This happens with comments.
raise EndMarkerReached() raise EndMarkerReached()
elif token.string.endswith(safeword):
yield token # Probably an f-string literal that was not finished.
raise EndMarkerReached()
else: else:
yield token_ yield token
# The code might be indedented, just remove it. # The code might be indedented, just remove it.
code = dedent(_get_code_for_stack(code_lines, module_node, pos)) code = dedent(_get_code_for_stack(code_lines, module_node, pos))

4
test/completion/fstring.py
View File

@@ -28,3 +28,7 @@ Fr'''sasdf''' + ''
#? ['upper'] #? ['upper']
f'xyz'.uppe f'xyz'.uppe
#? 3 []
f'f'