Skip to content

GH-94694: Fix column offsets for multi-line method lookups #94697

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 6 commits into from
Jul 10, 2022
Merged

GH-94694: Fix column offsets for multi-line method lookups #94697

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
937a3db
Add failing regression test
brandtbucher Jul 8, 2022
dd5a391
Fix invalid column math
brandtbucher Jul 8, 2022
ffd3413
Add additional tests for column locations
brandtbucher Jul 8, 2022
53ba444
blurb add
brandtbucher Jul 8, 2022
33dc4d8
Update comment
brandtbucher Jul 8, 2022
13c07ff
Feedback from code review
brandtbucher Jul 9, 2022
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
Prev Previous commit
Next Next commit
Fix invalid column math
  • Loading branch information
@brandtbucher
brandtbucher committed Jul 8, 2022
commit dd5a39195c2159afa4868ddbee06ed4e482b44a6
14 changes: 13 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4737,7 +4737,19 @@ update_location_to_match_attr(struct compiler *c, expr_ty meth)
if (meth->lineno != meth->end_lineno) {
// Make start location match attribute
c->u->u_loc.lineno = meth->end_lineno;
c->u->u_loc.col_offset = meth->end_col_offset - (int)PyUnicode_GetLength(meth->v.Attribute.attr)-1;
int len = (int)PyUnicode_GET_LENGTH(meth->v.Attribute.attr);
// The dot may or not be on this line. Don't try to include it in the
// column span, it's more trouble than it's worth:
if (len <= meth->end_col_offset) {
// |---- end_col_offset
// .method(...)
// |---------- new col_offset
c->u->u_loc.col_offset = meth->end_col_offset - len;
}
else {
// GH-94694: Somebody's compiling weird ASTs. Just drop the columns:
c->u->u_loc.col_offset = c->u->u_loc.end_col_offset = -1;
}
}
}

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy