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

Move toward ParserWithRecovery for the completion context.

Browse Source 
It was simply not possible to do it with the normal parser, because of dedents.
This commit is contained in:
Dave Halter
2016-07-28 23:12:54 +02:00
parent f605359c16
commit 142f6652b5
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/api/helpers.py
View File

@@ -135,22 +135,18 @@ def get_stack_at_position(grammar, code_lines, module, pos):
for token_ in tokens: for token_ in tokens:
if token_.string == safeword: if token_.string == safeword:
raise EndMarkerReached() raise EndMarkerReached()
elif token_.type == token.DEDENT and False:
# Ignore those. Error statements should not contain them, if
# they do it's for cases where an indentation happens and
# before the endmarker we still see them.
pass
else: else:
yield token_ yield token_
code = _get_code_for_stack(code_lines, module, pos) code = _get_code_for_stack(code_lines, module, pos)
# We use a word to tell Jedi when we have reached the start of the # We use a word to tell Jedi when we have reached the start of the
# completion. # completion.
safeword = 'XXX_USER_WANTS_TO_COMPLETE_HERE_WITH_JEDI' # Use Z as a prefix because it's not part of a number suffix.
safeword = 'ZZZ_USER_WANTS_TO_COMPLETE_HERE_WITH_JEDI'
# Remove as many indents from **all** code lines as possible. # Remove as many indents from **all** code lines as possible.
code = dedent(code + safeword) code = code + safeword
p = parser.Parser(grammar, code, start_parsing=False) p = parser.ParserWithRecovery(grammar, code, start_parsing=False)
try: try:
p.parse(tokenizer=tokenize_without_endmarker(code)) p.parse(tokenizer=tokenize_without_endmarker(code))
except EndMarkerReached: except EndMarkerReached:

11
jedi/parser/__init__.py
View File

@@ -289,7 +289,8 @@ class ParserWithRecovery(Parser):
:param module_path: The path of the module in the file system, may be None. :param module_path: The path of the module in the file system, may be None.
:type module_path: str :type module_path: str
""" """
def __init__(self, grammar, source, module_path=None, tokenizer=None): def __init__(self, grammar, source, module_path=None, tokenizer=None,
start_parsing=True):
self.syntax_errors = [] self.syntax_errors = []
self._omit_dedent_list = [] self._omit_dedent_list = []
@@ -304,8 +305,12 @@ class ParserWithRecovery(Parser):
# if self.options["print_function"]: # if self.options["print_function"]:
# python_grammar = pygram.python_grammar_no_print_statement # python_grammar = pygram.python_grammar_no_print_statement
# else: # else:
super(ParserWithRecovery, self).__init__(grammar, source, tokenizer=tokenizer) super(ParserWithRecovery, self).__init__(
grammar, source,
tokenizer=tokenizer,
start_parsing=start_parsing
)
if start_parsing:
self.module = self._parsed self.module = self._parsed
self.module.used_names = self._used_names self.module.used_names = self._used_names
self.module.path = module_path self.module.path = module_path