Skip to content

gh-120343: Fix column offsets of multiline tokens in tokenize #120391

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
Jun 12, 2024
Merged

gh-120343: Fix column offsets of multiline tokens in tokenize #120391

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
1478261
gh-120343: Fix column offsets of multiline tokens in tokenize
lysnikolaou Jun 12, 2024
6f86ce8
Fix tests
lysnikolaou Jun 12, 2024
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
14 changes: 14 additions & 0 deletions Lib/test/test_tokenize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,20 @@ def test_multiline_non_ascii_fstring(self):
FSTRING_END "\'\'\'" (2, 68) (2, 71)
""")

def test_multiline_non_ascii_fstring_with_expr(self):
self.check_tokenize("""\
f'''
🔗 This is a test {test_arg1}🔗
🔗'''""", """\
FSTRING_START "f\'\'\'" (1, 0) (1, 4)
FSTRING_MIDDLE '\\n 🔗 This is a test ' (1, 4) (2, 21)
OP '{' (2, 21) (2, 22)
NAME 'test_arg1' (2, 22) (2, 31)
OP '}' (2, 31) (2, 32)
FSTRING_MIDDLE '🔗\\n🔗' (2, 32) (3, 1)
FSTRING_END "\'\'\'" (3, 1) (3, 4)
""")

class GenerateTokensTest(TokenizeTest):
def check_tokenize(self, s, expected):
# Format the tokens in s in a table format.
Expand Down
14 changes: 10 additions & 4 deletions Python/Python-tokenize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ tokenizeriter_next(tokenizeriterobject *it)

const char *line_start = ISSTRINGLIT(type) ? it->tok->multi_line_start : it->tok->line_start;
PyObject* line = NULL;
int line_changed = 1;
if (it->tok->tok_extra_tokens && is_trailing_token) {
line = PyUnicode_FromString("");
} else {
Expand All @@ -229,12 +230,11 @@ tokenizeriter_next(tokenizeriterobject *it)
Py_XDECREF(it->last_line);
line = PyUnicode_DecodeUTF8(line_start, size, "replace");
it->last_line = line;
if (it->tok->lineno != it->last_end_lineno) {
it->byte_col_offset_diff = 0;
}
it->byte_col_offset_diff = 0;
} else {
// Line hasn't changed so we reuse the cached one.
line = it->last_line;
line_changed = 0;
}
}
if (line == NULL) {
Expand All @@ -252,7 +252,13 @@ tokenizeriter_next(tokenizeriterobject *it)
Py_ssize_t byte_offset = -1;
if (token.start != NULL && token.start >= line_start) {
byte_offset = token.start - line_start;
col_offset = byte_offset - it->byte_col_offset_diff;
if (line_changed) {
col_offset = _PyPegen_byte_offset_to_character_offset_line(line, 0, byte_offset);
it->byte_col_offset_diff = byte_offset - col_offset;
}
else {
col_offset = byte_offset - it->byte_col_offset_diff;
}
}
if (token.end != NULL && token.end >= it->tok->line_start) {
Py_ssize_t end_byte_offset = token.end - it->tok->line_start;
Expand Down
Loading