Reorder TypeFlags to improve sort order
#1226
Merged
Conversation
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
ahejlsberg
requested review from
DanielRosenwasser,
Copilot and
jakebailey
and removed request for
Copilot
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR reorders the TypeFlags enum to improve the sort order of types, placing the object type and nonprimitive flag earlier and shifting union and intersection types later. Key changes include updating the bit-shift values in internal/checker/types.go and corresponding updates to many baseline test outputs that reflect the new ordering.
Reviewed Changes
Copilot reviewed 44 out of 44 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| internal/checker/types.go | Reordering of type flag constants to support improved sort order |
| testdata/** | Updated baselines and test files to align with the new sort order of types |
Comments suppressed due to low confidence (1)
internal/checker/types.go:430
- The reordering of TypeFlags shifts the bit positions for several flags; please verify that all dependent logic and tests are updated accordingly to avoid any inadvertent side effects.
TypeFlagsNonPrimitive TypeFlags = 1 << 17 // intrinsic object type
jakebailey
reviewed
Jun 18, 2025
| function foo(instance: Function | object) { | ||
| ->foo : (instance: Function | object) => number | ||
| ->instance : Function | object | ||
| +>foo : (instance: object | Function) => number |
Member
There was a problem hiding this comment.
I can update the submodule's ordering to reflect this change separately.
jakebailey
approved these changes
Jun 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR reorders the
TypeFlagsenum such thatobjecttype sorts before actual object types, andThis fixes #1164 and also ensures that union subtype reduction prefers non-intersections over intersections when types are mutual subtypes.
Fixes #1164.