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

Allow no whitespace after lambda body in certain cases #939

Merged
merged 9 commits into from
Jun 7, 2023
Merged

Allow no whitespace after lambda body in certain cases #939

merged 9 commits into from
Jun 7, 2023

Conversation

zsol added 9 commits May 27, 2023 10:07
For an expression like `f"{one:{two:}{three}}"`, `three` is not in an f-string spec, and should be tokenized accordingly.

This PR fixes the `format_spec_count` bookkeeping in the tokenizer, so it properly decrements it when a closing `}` is encountered but only if the `}` closes a format_spec.

Reported in #930.
This is an obscure one.

`_ if 0else _` failed to parse with some very weird errors. It turns out that the tokenizer tries to parse `0else` as a single number, but when it encounters `l` it realizes it can't be a single number and it backtracks.

Unfortunately the backtracking logic was broken, and it failed to correctly backtrack one of the offsets used for whitespace parsing (the byte offset since the start of the line). This caused whitespace nodes to refer to incorrect parts of the input text, eventually resulting in the above behavior.

This PR fixes the bookkeeping when the tokenizer backtracks.

Reported in #930.
Python accepts code where `lambda` follows a `*`, so this PR relaxes validation rules for Lambdas.

Raised in #930.
This PR relaxes the accepted types for the `elt` field in `ListComp`, `SetComp`, and `GenExp`, as well as the `key` and `value` fields in `DictComp`.

Fixes #500.
For example in `_ if _ else""if _ else _`.

Raised in #930. Also fixes #854.
Like in `[_:=''for _ in _]`

Raised in #930.
Like in `[lambda:()for _ in _]`

Reported in #930.
@codecov-commenter
Copy link

Codecov Report

Patch coverage: 94.28% and project coverage change: -0.01 ⚠️

Comparison is base (59aeceb) 90.92% compared to head (ea4ea34) 90.92%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #939      +/-   ##
==========================================
- Coverage   90.92%   90.92%   -0.01%     
==========================================
  Files         254      254              
  Lines       25937    25955      +18     
==========================================
+ Hits        23584    23600      +16     
- Misses       2353     2355       +2     
Impacted Files Coverage Δ
libcst/_nodes/tests/test_dict_comp.py 100.00% <ø> (ø)
libcst/_nodes/tests/test_ifexp.py 100.00% <ø> (ø)
libcst/_nodes/tests/test_lambda.py 100.00% <ø> (ø)
libcst/_nodes/tests/test_namedexpr.py 94.73% <ø> (ø)
libcst/_nodes/tests/test_simple_comp.py 100.00% <ø> (ø)
libcst/_nodes/tests/test_with.py 100.00% <ø> (ø)
libcst/_typed_visitor.py 97.01% <ø> (ø)
libcst/matchers/__init__.py 100.00% <ø> (ø)
libcst/_nodes/expression.py 96.64% <91.66%> (-0.10%) ⬇️
libcst/_nodes/statement.py 94.93% <100.00%> (ø)
... and 1 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants