Skip to content

Bugfix in indenter - now always creating dedents with line information #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 3, 2025
Merged

Bugfix in indenter - now always creating dedents with line information #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d248fc
Fix in indenter - now always creating dedents with line information
erezsh Jul 31, 2025
2e3108e
UnexpectedInput.pos_in_stream now defaults to 0
erezsh Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lark/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ def get_context(self, text: str, span: int=40) -> str:
The parser doesn't hold a copy of the text it has to parse,
so you have to provide it again
"""
assert self.pos_in_stream is not None, self
pos = self.pos_in_stream
pos = self.pos_in_stream or 0
start = max(pos - span, 0)
end = pos + span
if not isinstance(text, bytes):
Expand Down
3 changes: 2 additions & 1 deletion lark/indenter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def handle_NL(self, token: Token) -> Iterator[Token]:
raise DedentError('Unexpected dedent to column %s. Expected dedent to %s' % (indent, self.indent_level[-1]))

def _process(self, stream):
token = None
for token in stream:
if token.type == self.NL_type:
yield from self.handle_NL(token)
Expand All @@ -69,7 +70,7 @@ def _process(self, stream):

while len(self.indent_level) > 1:
self.indent_level.pop()
yield Token(self.DEDENT_type, '')
yield Token.new_borrow_pos(self.DEDENT_type, '', token) if token else Token(self.DEDENT_type, '', 0, 0, 0, 0, 0, 0)

assert self.indent_level == [0], self.indent_level

Expand Down
Loading