gh-112943: Correctly compute end offsets for multiline tokens in the tokenize module - #112949
Merged
pablogsal merged 2 commits intoDec 11, 2023
Merged
gh-112943: Correctly compute end offsets for multiline tokens in the tokenize module#112949pablogsal merged 2 commits into
pablogsal merged 2 commits into
Conversation
…n the tokenize module
pablogsal
commented
Dec 11, 2023
Comment thread
Python/Python-tokenize.c
| } | ||
| if (token.end != NULL && token.end >= it->tok->line_start) { | ||
| end_col_offset = _PyPegen_byte_offset_to_character_offset(line, token.end - it->tok->line_start); | ||
| end_col_offset = _PyPegen_byte_offset_to_character_offset_raw(it->tok->line_start, token.end - it->tok->line_start); |
Copy link
Copy Markdown
Member
Author
There was a problem hiding this comment.
it->tok->line_start holds the last line tokenised (the last line of the multi-line string) while line holds the entire multi-line string from the start to the end.
Sorry, something went wrong.
serhiy-storchaka
approved these changes
Dec 11, 2023
Comment thread
Lib/test/test_tokenize.py
Outdated
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Copy link
Copy Markdown
|
Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12. |
Sorry, something went wrong.
Copy link
Copy Markdown
|
Sorry, @pablogsal, I could not cleanly backport this to 3.12 due to a conflict. cherry_picker a135a6d2c6d503b186695f01efa7eed65611b04e 3.12 |
Sorry, something went wrong.
Copy link
Copy Markdown
|
GH-112957 is a backport of this pull request to the 3.12 branch. |
Sorry, something went wrong.
pablogsal
added a commit
to pablogsal/cpython
that referenced
this pull request
Dec 11, 2023
…okens in the tokenize module (pythonGH-112949) (cherry picked from commit a135a6d) Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
pablogsal
added a commit
that referenced
this pull request
Dec 11, 2023
aisk
pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
…n the tokenize module (python#112949)
Glyphack
pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
…n the tokenize module (python#112949)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
Assignees
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.