Skip to content
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

Fix crash when attempting to merge an import with a local declaration #18032

Merged
merged 2 commits into from
Aug 25, 2017

Conversation

weswigham
Copy link
Member

Somewhere around #7591, we decided to allow aliases to merge with other symbols. A NamespaceImport is 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 handle NamespaceImport in getDeclarationSpaces.

Fixes #17982

@mhegazy
Copy link
Contributor

mhegazy commented Aug 24, 2017

Please port this to release-2.5

@weswigham weswigham merged commit 62eaaf9 into microsoft:master Aug 25, 2017
@weswigham weswigham deleted the remove-crash-on-merged-import branch August 25, 2017 00:12
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
weswigham added a commit that referenced this pull request Aug 25, 2017
…#18032) (#18034)

* There should be no crash when attempting to merge an import with a local declaration

* Show symbol has actually merged within the module
@weswigham weswigham restored the remove-crash-on-merged-import branch November 22, 2017 02:23
@microsoft microsoft locked and limited conversation to collaborators Jun 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants