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

Remove source parameter from parser.

Browse Source
This commit is contained in:
Dave Halter
2017-03-31 21:44:43 +02:00
parent a687910368
commit 1bb0c89f46
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/api/helpers.py
View File

@@ -132,7 +132,7 @@ def get_stack_at_position(grammar, code_lines, module_node, pos):
safeword = 'ZZZ_USER_WANTS_TO_COMPLETE_HERE_WITH_JEDI' safeword = 'ZZZ_USER_WANTS_TO_COMPLETE_HERE_WITH_JEDI'
code = code + safeword code = code + safeword
p = Parser(grammar, code, error_recovery=True) p = Parser(grammar, error_recovery=True)
try: try:
p.parse(tokens=tokenize_without_endmarker(code)) p.parse(tokens=tokenize_without_endmarker(code))
except EndMarkerReached: except EndMarkerReached:

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

@@ -111,7 +111,7 @@ def parse(code=None, path=None, grammar=None, error_recovery=True,
tokens = generate_tokens(tokenize_lines, use_exact_op_types=True) tokens = generate_tokens(tokenize_lines, use_exact_op_types=True)
p = Parser(grammar, code, error_recovery=error_recovery, start_symbol=start_symbol) p = Parser(grammar, error_recovery=error_recovery, start_symbol=start_symbol)
root_node = p.parse(tokens=tokens) root_node = p.parse(tokens=tokens)
if added_newline: if added_newline:
_remove_last_newline(root_node) _remove_last_newline(root_node)

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

@@ -372,7 +372,6 @@ class DiffParser(object):
) )
self._active_parser = Parser( self._active_parser = Parser(
self._grammar, self._grammar,
source='\n',
error_recovery=True error_recovery=True
) )
return self._active_parser.parse(tokens=tokens) return self._active_parser.parse(tokens=tokens)

6
jedi/parser/python/parser.py
View File

@@ -13,7 +13,6 @@ class Parser(BaseParser):
class structure of different scopes. class structure of different scopes.
:param grammar: The grammar object of pgen2. Loaded by load_grammar. :param grammar: The grammar object of pgen2. Loaded by load_grammar.
:param source: The codebase for the parser. Must be unicode.
""" """
node_map = { node_map = {
@@ -47,12 +46,9 @@ class Parser(BaseParser):
} }
default_node = tree.PythonNode default_node = tree.PythonNode
def __init__(self, grammar, source, error_recovery=True, start_symbol='file_input'): def __init__(self, grammar, error_recovery=True, start_symbol='file_input'):
super(Parser, self).__init__(grammar, start_symbol, error_recovery=error_recovery) super(Parser, self).__init__(grammar, start_symbol, error_recovery=error_recovery)
self.source = source
self.new_code = source
self.syntax_errors = [] self.syntax_errors = []
self._omit_dedent_list = [] self._omit_dedent_list = []
self._indent_counter = 0 self._indent_counter = 0