Skip to content
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.

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

Fix off-by-one issues in TokenTree and TreeCursor #1891

Merged
merged 1 commit into from
Jul 31, 2023

Conversation

milesziemer
Copy link
Contributor

Fixes an issue in TokenTree where if the smithy file was missing a trailing newline, any trees containing the last piece of text in the file would have an end location of (0, 0). This happened because the BR TreeType didn't append any tokens for the EOF case, so the BR tree had no end location.

Fixes an issue in TreeCursor::findAt where if you tried to get the tree at a location right at the start of a tree, you would get the previous tree.

Tests were added for both of these cases in TreeCursorTest.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Fixes an issue in TokenTree where if the smithy file was missing a
trailing newline, any trees containing the last piece of text in
the file would have an end location of (0, 0). This happened because
the BR TreeType didn't append any tokens for the EOF case, so the
BR tree had no end location.

Fixes an issue in TreeCursor::findAt where if you tried to get the
tree at a location right at the start of a tree, you would get the
previous tree.

Tests were added for both of these cases in TreeCursorTest.
@milesziemer milesziemer requested a review from a team as a code owner July 31, 2023 13:47
@milesziemer milesziemer merged commit 59578f3 into smithy-lang:main Jul 31, 2023
10 checks passed
syall pushed a commit to Xtansia/smithy that referenced this pull request Aug 11, 2023
Fixes an issue in TokenTree where if the smithy file was missing a
trailing newline, any trees containing the last piece of text in
the file would have an end location of (0, 0). This happened because
the BR TreeType didn't append any tokens for the EOF case, so the
BR tree had no end location.

Fixes an issue in TreeCursor::findAt where if you tried to get the
tree at a location right at the start of a tree, you would get the
previous tree.

Tests were added for both of these cases in TreeCursorTest.
alextwoods pushed a commit to alextwoods/smithy that referenced this pull request Sep 15, 2023
Fixes an issue in TokenTree where if the smithy file was missing a
trailing newline, any trees containing the last piece of text in
the file would have an end location of (0, 0). This happened because
the BR TreeType didn't append any tokens for the EOF case, so the
BR tree had no end location.

Fixes an issue in TreeCursor::findAt where if you tried to get the
tree at a location right at the start of a tree, you would get the
previous tree.

Tests were added for both of these cases in TreeCursorTest.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants