Fix using declarations when Symbol is shadowed#63541
Open
xsourabhsharma wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Adds coverage and updates the __addDisposableResource emit helper to correctly reference the global Symbol when a local Symbol binding shadows it.
Changes:
- Add a new conformance test for
using/await usingwhenSymbolis shadowed in user code. - Update the emitted
__addDisposableResourcehelper to readSymbolfromglobalThisand guard against missing globals. - Refresh affected test baselines to match the updated helper text.
Reviewed changes
Copilot reviewed 64 out of 64 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsShadowedGlobalSymbol.ts | New test ensuring disposal symbols are taken from globalThis.Symbol even if Symbol is shadowed. |
| tests/baselines/reference/usingDeclarationsShadowedGlobalSymbol.js | New baseline for the added conformance test. |
| tests/baselines/reference/usingDeclarationsNamedEvaluationDecoratorsAndClassFields.js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInFor(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInFor(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInFor(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarationsInFor(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.3(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.3(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.3(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.3(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.2(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.2(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.2(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.2(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.12(usedefineforclassfields=true).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.12(usedefineforclassfields=false).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.11(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.11(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.1(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.1(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.1(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/usingDeclarations.1(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/transpile/jsWithSourceMapBasic(sourceMap=true).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/transpile/jsWithSourceMapBasic(sourceMap=false).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/transpile/jsWithInlineSourceMapBasic(inlineSourceMap=true).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/transpile/jsWithInlineSourceMapBasic(inlineSourceMap=false).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/transpile/declarationBasicSyntax(declarationMap=true).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/transpile/declarationBasicSyntax(declarationMap=false).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInFor(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarationsInFor(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.3(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.3(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.3(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.3(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.2(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.2(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.2(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.2(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.1(target=es5).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.1(target=es2022).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.1(target=es2017).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| tests/baselines/reference/awaitUsingDeclarations.1(target=es2015).js | Baseline update reflecting new __addDisposableResource global Symbol lookup and guards. |
| src/compiler/factory/emitHelpers.ts | Updates __addDisposableResource helper emit to reference globalThis.Symbol and handle missing globals safely. |
Author
|
@microsoft-github-policy-service agree |
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 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.
Fixes #63522
This updates the disposable resource emit helper to resolve disposable symbols through
globalThis.Symbol, so local declarations namedSymboldo not shadow the globalSymbolconstructor used byusingandawait usingemit.A regression test covers both
usingandawait usingwhen a module exports a class namedSymbol.Tests run:
npx hereby runtests --tests=usingDeclarationsShadowedGlobalSymbolnpx hereby runtests --tests=usingDeclarationsnpx hereby runtests-parallel