forked from microsoft/TypeScript
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge main
for Calculation PR
#1
Merged
Merged
Conversation
This file contains 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
… in template literal types (microsoft#57808)
Co-authored-by: Daniel Rosenwasser <[email protected]>
…gs (microsoft#57839) Co-authored-by: Daniel Rosenwasser <[email protected]>
…c SymbolFlags meaning (microsoft#57887)
… be same as if they were included through import (microsoft#58560)
… for the same symbol from different files (microsoft#58597)
…oft#58605) Co-authored-by: TypeScript Bot <[email protected]>
…t can impact js emit as well (microsoft#58594)
…ure for incremental build (microsoft#58592)
# Conflicts: # src/compiler/checker.ts # src/compiler/types.ts # src/harness/fourslashInterfaceImpl.ts # src/lib/es5.d.ts # tests/baselines/reference/api/tsserverlibrary.d.ts # tests/baselines/reference/api/typescript.d.ts # tests/baselines/reference/intrinsicTypes.errors.txt # tests/baselines/reference/jsDeclarationsJSDocRedirectedLookups.js # tests/baselines/reference/recursiveConditionalTypes.js # tests/baselines/reference/recursiveConditionalTypes.types
If you would risk to merge, It would be easier to make further PR's and discussions about the |
Another merge conflict again, they just reserved the last Edit: just tested, still works with bit 31. |
Thank you! |
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.
Hey @skeate, this is the first draft to bring your PR closer to
HEAD
again.I invested most time into
src/compiler/checker.ts
and I stumbled over three issues I'm not certain about:In TypeScript
HEAD
they introduced thetypeKind === IntrinsicTypeKind.NoInfer
condition during my debugging I couldn't even figure out what its used for, I just reintegrated it into the case oftypeArguments.length === 1
- maybe the case for two arguments should also contain it?I just merged the unit tests, but didn't do anything besides
npx hereby local
... probably needs more work(todo ... I will just send now, because I don't know if GitHub even handles more than 2k commits, it just loads indefinitely lol)