Fix crash when attempting to merge an import with a local declaration#18032
Merged
weswigham merged 2 commits intomicrosoft:masterfrom Aug 25, 2017
Merged
Conversation
mhegazy
approved these changes
Aug 24, 2017
Contributor
|
Please port this to release-2.5 |
weswigham
added a commit
to weswigham/TypeScript
that referenced
this pull request
Aug 25, 2017
…microsoft#18032) * There should be no crash when attempting to merge an import with a local declaration * Show symbol has actually merged within the module
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.
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.
Somewhere around #7591, we decided to allow aliases to merge with other symbols. A
NamespaceImportis an alias symbol, so is able to merge with another symbol in the file. We no longer crash when you attempt this, as we now handleNamespaceImportingetDeclarationSpaces.Fixes #17982