[ty] Fix completions at end of file#20993
Merged
MichaReiser merged 5 commits intomainfrom Oct 21, 2025
Merged
Conversation
MichaReiser
added
bug
MichaReiser
requested review from
AlexWaygood,
carljm,
dcreager,
dhruvmanila and
sharkdp
as code owners
sharkdp
reviewed
Oct 20, 2025
Contributor
Diagnostic diff on typing conformance testsNo changes detected when running ty on typing conformance tests ✅ |
Contributor
|
Contributor
|
sharkdp
approved these changes
Oct 21, 2025
Contributor
sharkdp
left a comment
sharkdp
left a comment
There was a problem hiding this comment.
Thank you!
Initially, I was hoping that something like
self.binary_search_by_key(&(offset, 0), |token: &Token| {
(token.start(), std::ptr::from_ref(token) as usize)
})would also work. It does always find the first element, but it obviously changes all Ok(…)s into Err(…)s, and some callers rely on that distinction.
dhruvmanila
approved these changes
Oct 21, 2025
dcreager
added a commit
that referenced
this pull request
Oct 22, 2025
* main: (65 commits) [ty] Some more simplifications when rendering constraint sets (#21009) [ty] Make `attributes.md` mdtests faster (#21030) [ty] Set `INSTA_FORCE_PASS` and `INSTA_OUTPUT` environment variables from mdtest.py (#21029) [ty] Fall back to `Divergent` for deeply nested specializations (#20988) [`ruff`] Autogenerate TypeParam nodes (#21028) [ty] Add assertions to ensure that we never call `KnownClass::Tuple.to_instance()` or similar (#21027) [`ruff`] Auto generate ast Pattern nodes (#21024) [`flake8-simplify`] Skip `SIM911` when unknown arguments are present (#20697) Render a diagnostic for syntax errors introduced in formatter tests (#21021) [ty] Support goto-definition on vendored typeshed stubs (#21020) [ty] Implement go-to for binary and unary operators (#21001) [ty] Avoid ever-growing default types (#20991) [syntax-errors] Name is parameter and global (#20426) [ty] Disable panicking mdtest (#21016) [ty] Fix completions at end of file (#20993) [ty] Fix out-of-order semantic token for function with regular argument after kwargs (#21013) [ty] Fix auto import for files with `from __future__` import (#20987) [`fastapi`] Handle ellipsis defaults in FAST002 autofix (`FAST002`) (#20810) [`ruff`] Skip autofix for keyword and `__debug__` path params (#20960) [`flake8-bugbear`] Skip `B905` and `B912` if <2 iterables and no starred arguments (#20998) ...
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
3 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.
Summary
Fixes astral-sh/ty#1392
The methods on
Tokensincorrectly assumed that there can be at most one token starting or ending atoffset.Unfortunately, this isn't the case because Ruff's lexer can produce zero-length tokens. The most common
zero length tokens are the
Newlineat the end of the file (The lexer must emit this token because every logical line must end with a newline token),or
Dedenttokens (which are emitted when there are "fewer" indents, they're always zero length).The fix in this PR is to make the methods on
Tokensaware of this and return the first token starting ator last token ending at a given offset (instead of any token starting or ending at).
Test Plan
Added test