-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Fix using transform variable shadowing in for-of loops #61934
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
Open
Copilot
wants to merge
8
commits into
main
Choose a base branch
from
copilot/fix-61714-2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+818
−116
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
34e17b3
Initial plan for issue
Copilot 237579e
Implement variable renaming for using declaration shadowing in for-of…
Copilot 6fead46
Add test baselines for using declaration shadowing fix
Copilot 2738f69
Add importHelpers directive and fix line endings
Copilot 8f3df02
Implement block scoping approach for using declaration shadowing in f…
Copilot 0b3bf33
Fix empty block generation in using declaration for-of loops and remo…
Copilot 957cf79
Fix empty statement handling in using declaration for-of loops
Copilot 88c9bfa
Fix trailing whitespace in esnext.ts
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
24 changes: 24 additions & 0 deletions
24
tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. | ||
|
||
|
||
==== main.ts (1 errors) ==== | ||
class Foo {} | ||
|
||
for (using foo of []) { | ||
const foo = new Foo(); | ||
} | ||
|
||
for (using bar of []) { | ||
let bar = "test"; | ||
} | ||
|
||
for (using baz of []) { | ||
var baz = 42; | ||
~~~ | ||
!!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. | ||
} | ||
|
||
==== tslib.d.ts (0 errors) ==== | ||
export declare function __addDisposableResource<T>(env: any, value: T, async: boolean): T; | ||
export declare function __disposeResources(env: any): void; | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider a block with just an empty statement the same as an empty block and avoid emitting the new block.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in commit 957cf79. The implementation now considers blocks containing only empty statements as effectively empty and avoids generating the extra wrapping block in those cases.