Allow circular umd-merged-with-augmentation refs to resolve to the module as intended#29335
Merged
weswigham merged 1 commit intomicrosoft:masterfrom Jan 10, 2019
Merged
Conversation
sheetalkamat
approved these changes
Jan 10, 2019
errendir
added a commit
to errendir/TypeScript
that referenced
this pull request
Jan 14, 2019
* origin/master: (1082 commits) Fix unneeded cast lints (microsoft#29383) Extracted compilerOptions setting to helper function Added codefix to enable experimentalDecorators in the user's config file Add tests for noLib with <reference lib> and bundling. Add tests for noLib with <reference lib>. Do not process library reference directives with noLib set. emit jsx type arguments Allow circular umd-merged-with-augmentation refs to resolve to the module as intended (microsoft#29335) Allow nonnull assertions in references (microsoft#29351) Accept new baselines Add regression tests Improve logic that determines when to resolve conditional types Update user baselines (microsoft#29336) Fix crash (microsoft#29333) Exclude JSDoc @extends from 'super()' checks (microsoft#29308) Fix existing test Verify that completion with new identifier location returns isNewIdentifierLocation: true Fixes microsoft#24009 Fix the failing test case There is no need to check for file presence when trying to rename imports based on file rename Fixes microsoft#29031 Fix gulp baseline-accept (microsoft#29301) ...
This was referenced Jan 15, 2019
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
Fixes #28924
We try to look up the type from the annotation, on the global, but because of the umd ref, it merged with the module declaration itself - the second time around we just want to go to the module rather than trying the annotation again (or reporting a circularity error, as it were).