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.

Sign up for GitHub

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

Jump to bottom

Fake up a namespace enclosing declaration when generating expando namespace members #31971

Merged
merged 2 commits into from Jun 20, 2019
Merged

Fake up a namespace enclosing declaration when generating expando namespace members #31971

merged 2 commits into from Jun 20, 2019

Conversation

weswigham
Copy link
Member

@weswigham weswigham commented Jun 18, 2019 •
edited

This causes the LHS property names to appropriately shadow the names available within the namespace when doing lookup for type names during type node creation.

Fixes #31882
Also fixes #31676 (typo introduced in this change - the hasModifier check should just be ModifierFlags.Default rather than ModifierFlags.ExportDefault)

@weswigham weswigham merged commit f2735b5 into microsoft:master Jun 20, 2019
@weswigham
Copy link
Member Author

@typescript-bot cherry-pick this to release-3.5

@typescript-bot
Copy link
Collaborator

Hey @weswigham, I couldn't open a PR with the cherry-pick. (You can check the log here). You may need to squash and pick this PR into release-3.5 manually.

@weswigham
Copy link
Member Author

@typescript-bot cherry-pick this to release-3.5

@typescript-bot
Copy link
Collaborator

Hey @weswigham, I couldn't open a PR with the cherry-pick. (You can check the log here). You may need to squash and pick this PR into release-3.5 manually.

@weswigham
Copy link
Member Author

@typescript-bot cherry-pick this to release-3.5

@typescript-bot
Copy link
Collaborator

Hey @weswigham, I couldn't open a PR with the cherry-pick. (You can check the log here). You may need to squash and pick this PR into release-3.5 manually.

@weswigham
Copy link
Member Author

weswigham commented Jun 21, 2019 •
edited

meh, apparently once a PR is merged you can't force it to take a new commit with a patch to the build infra :P looks like i'll open it by hand, fiiiiiine

weswigham added a commit to weswigham/TypeScript that referenced this pull request Jun 21, 2019
@weswigham
Fake up a namespace enclosing declaration when generating expando nam…
9967946 
…espace members (microsoft#31971)

* Fake up a namespace enclosing declaration when generating expando namespace members

* Fix microsoft#31676
@weswigham weswigham mentioned this pull request Jun 21, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sandersn sandersn sandersn approved these changes

@RyanCavanaugh RyanCavanaugh Awaiting requested review from RyanCavanaugh

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Types declaration on "Static" members of a function are invalid [3.5.1] Incorrect generated declaration file
3 participants
@weswigham @typescript-bot @sandersn