From 34e17b3bb8102d72c109538da2b22db8770676f0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Jun 2025 16:43:32 +0000 Subject: [PATCH 1/8] Initial plan for issue From 237579e33ffc0aa8bf1375aac6c05da1dfec582c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Jun 2025 16:54:57 +0000 Subject: [PATCH 2/8] Implement variable renaming for using declaration shadowing in for-of loops Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com> --- src/compiler/transformers/esnext.ts | 293 +++++++++++------- .../usingDeclarationsInForOfShadowing.ts | 18 ++ 2 files changed, 199 insertions(+), 112 deletions(-) create mode 100644 tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index eace2e2c28057..d7519127ed995 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -1,67 +1,69 @@ -import { - addEmitHelpers, - addRange, - append, - arrayFrom, - BindingElement, - Block, - Bundle, - CaseOrDefaultClause, - chainBundle, - ClassDeclaration, - Debug, - EmitFlags, - ExportAssignment, - ExportSpecifier, - Expression, - firstOrUndefined, - ForOfStatement, - ForStatement, - GeneratedIdentifierFlags, - getEmitFlags, - hasSyntacticModifier, - Identifier, - IdentifierNameMap, - isArray, - isBindingPattern, - isBlock, - isCaseClause, - isCustomPrologue, - isExpression, - isGeneratedIdentifier, - isIdentifier, - isLocalName, - isNamedEvaluation, - isOmittedExpression, - isPrologueDirective, - isSourceFile, - isStatement, - isVariableDeclarationList, - isVariableStatement, - ModifierFlags, - Node, - NodeFlags, - setCommentRange, - setEmitFlags, - setOriginalNode, - setSourceMapRange, - setTextRange, - skipOuterExpressions, - SourceFile, - Statement, - SwitchStatement, - SyntaxKind, - TransformationContext, - TransformFlags, - transformNamedEvaluation, - VariableDeclaration, - VariableDeclarationList, - VariableStatement, - visitArray, - visitEachChild, - visitNode, - visitNodes, - VisitResult, +import { + addEmitHelpers, + addRange, + append, + arrayFrom, + BindingElement, + Block, + Bundle, + CaseOrDefaultClause, + chainBundle, + ClassDeclaration, + Debug, + EmitFlags, + ExportAssignment, + ExportSpecifier, + Expression, + firstOrUndefined, + forEachChild, + ForOfStatement, + ForStatement, + GeneratedIdentifierFlags, + getEmitFlags, + hasSyntacticModifier, + Identifier, + IdentifierNameMap, + isArray, + isBindingPattern, + isBlock, + isCaseClause, + isCustomPrologue, + isExpression, + isGeneratedIdentifier, + isIdentifier, + isLocalName, + isNamedEvaluation, + isOmittedExpression, + isPrologueDirective, + isSourceFile, + isStatement, + isVariableDeclaration, + isVariableDeclarationList, + isVariableStatement, + ModifierFlags, + Node, + NodeFlags, + setCommentRange, + setEmitFlags, + setOriginalNode, + setSourceMapRange, + setTextRange, + skipOuterExpressions, + SourceFile, + Statement, + SwitchStatement, + SyntaxKind, + TransformationContext, + TransformFlags, + transformNamedEvaluation, + VariableDeclaration, + VariableDeclarationList, + VariableStatement, + visitArray, + visitEachChild, + visitNode, + visitNodes, + VisitResult, } from "../_namespaces/ts.js"; const enum UsingKind { @@ -289,54 +291,121 @@ export function transformESNext(context: TransformationContext): (x: SourceFile ); } - return visitEachChild(node, visitor, context); - } - - function visitForOfStatement(node: ForOfStatement) { - if (isUsingVariableDeclarationList(node.initializer)) { - // given: - // - // for (using x of y) { ... } - // - // produces a shallow transformation to: - // - // for (const x_1 of y) { - // using x = x; - // ... - // } - // - // before handing the shallow transformation back to the visitor for an in-depth transformation. - const forInitializer = node.initializer; - const forDecl = firstOrUndefined(forInitializer.declarations) || factory.createVariableDeclaration(factory.createTempVariable(/*recordTempVariable*/ undefined)); - - const isAwaitUsing = getUsingKindOfVariableDeclarationList(forInitializer) === UsingKind.Async; - const temp = factory.getGeneratedNameForNode(forDecl.name); - const usingVar = factory.updateVariableDeclaration(forDecl, forDecl.name, /*exclamationToken*/ undefined, /*type*/ undefined, temp); - const usingVarList = factory.createVariableDeclarationList([usingVar], isAwaitUsing ? NodeFlags.AwaitUsing : NodeFlags.Using); - const usingVarStatement = factory.createVariableStatement(/*modifiers*/ undefined, usingVarList); - return visitNode( - factory.updateForOfStatement( - node, - node.awaitModifier, - factory.createVariableDeclarationList([ - factory.createVariableDeclaration(temp), - ], NodeFlags.Const), - node.expression, - isBlock(node.statement) ? - factory.updateBlock(node.statement, [ - usingVarStatement, - ...node.statement.statements, - ]) : - factory.createBlock([ - usingVarStatement, - node.statement, - ], /*multiLine*/ true), - ), - visitor, - isStatement, - ); - } - return visitEachChild(node, visitor, context); + return visitEachChild(node, visitor, context); + } + + /** + * Collects all variable declarations that shadow a given identifier name in a statement. + */ + function collectShadowingVariables(statement: Statement, shadowedName: string): VariableDeclaration[] { + const shadowingVars: VariableDeclaration[] = []; + + function visit(node: Node): void { + if (isVariableStatement(node)) { + for (const declaration of node.declarationList.declarations) { + if (isIdentifier(declaration.name) && declaration.name.escapedText === shadowedName) { + shadowingVars.push(declaration); + } + } + } + forEachChild(node, visit); + } + + visit(statement); + return shadowingVars; + } + + /** + * Creates a visitor that renames shadowing variables to avoid conflicts. + */ + function createShadowingVariableRenamer(shadowedName: string): (node: Node) => VisitResult { + const renamingMap = new Map(); + + return function renameShadowingVariables(node: Node): VisitResult { + if (isVariableDeclaration(node) && isIdentifier(node.name) && node.name.escapedText === shadowedName) { + // Create a unique name for this shadowing variable + const uniqueName = factory.createUniqueName(shadowedName as string, GeneratedIdentifierFlags.Optimistic); + renamingMap.set(node.name.escapedText as string, uniqueName); + + return factory.updateVariableDeclaration( + node, + uniqueName, + node.exclamationToken, + node.type, + visitNode(node.initializer, renameShadowingVariables, isExpression) + ); + } + + if (isIdentifier(node)) { + const renamed = renamingMap.get(node.escapedText as string); + if (renamed) { + return renamed; + } + } + + return visitEachChild(node, renameShadowingVariables, context); + }; + } + + function visitForOfStatement(node: ForOfStatement) { + if (isUsingVariableDeclarationList(node.initializer)) { + // given: + // + // for (using x of y) { ... } + // + // produces a shallow transformation to: + // + // for (const x_1 of y) { + // using x = x; + // ... + // } + // + // before handing the shallow transformation back to the visitor for an in-depth transformation. + const forInitializer = node.initializer; + const forDecl = firstOrUndefined(forInitializer.declarations) || factory.createVariableDeclaration(factory.createTempVariable(/*recordTempVariable*/ undefined)); + + const isAwaitUsing = getUsingKindOfVariableDeclarationList(forInitializer) === UsingKind.Async; + const temp = factory.getGeneratedNameForNode(forDecl.name); + const usingVar = factory.updateVariableDeclaration(forDecl, forDecl.name, /*exclamationToken*/ undefined, /*type*/ undefined, temp); + const usingVarList = factory.createVariableDeclarationList([usingVar], isAwaitUsing ? NodeFlags.AwaitUsing : NodeFlags.Using); + const usingVarStatement = factory.createVariableStatement(/*modifiers*/ undefined, usingVarList); + + // Check if the loop body contains shadowing variables and rename them if necessary + const shadowedName = isIdentifier(forDecl.name) ? forDecl.name.escapedText as string : undefined; + let transformedStatement = node.statement; + + if (shadowedName) { + const shadowingVars = collectShadowingVariables(node.statement, shadowedName); + if (shadowingVars.length > 0) { + // Apply the renaming visitor to the loop body + const renamer = createShadowingVariableRenamer(shadowedName); + transformedStatement = visitNode(node.statement, renamer, isStatement); + } + } + + return visitNode( + factory.updateForOfStatement( + node, + node.awaitModifier, + factory.createVariableDeclarationList([ + factory.createVariableDeclaration(temp), + ], NodeFlags.Const), + node.expression, + isBlock(transformedStatement) ? + factory.updateBlock(transformedStatement, [ + usingVarStatement, + ...transformedStatement.statements, + ]) : + factory.createBlock([ + usingVarStatement, + transformedStatement, + ], /*multiLine*/ true), + ), + visitor, + isStatement, + ); + } + return visitEachChild(node, visitor, context); } function visitCaseOrDefaultClause(node: CaseOrDefaultClause, envBinding: Identifier) { diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts new file mode 100644 index 0000000000000..2eafdebadd958 --- /dev/null +++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts @@ -0,0 +1,18 @@ +// @target: esnext,es2022,es2017,es2015,es5 +// @module: esnext +// @lib: esnext +// @noTypesAndSymbols: true + +class Foo {} + +for (using foo of []) { + const foo = new Foo(); +} + +for (using bar of []) { + let bar = "test"; +} + +for (using baz of []) { + var baz = 42; +} \ No newline at end of file From 6fead4671cb1cb11f5d303b34c9f16851185a14a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Jun 2025 17:05:51 +0000 Subject: [PATCH 3/8] Add test baselines for using declaration shadowing fix Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com> --- ...InForOfShadowing(target=es2015).errors.txt | 19 +++ ...arationsInForOfShadowing(target=es2015).js | 114 +++++++++++++++++ ...InForOfShadowing(target=es2017).errors.txt | 19 +++ ...arationsInForOfShadowing(target=es2017).js | 114 +++++++++++++++++ ...InForOfShadowing(target=es2022).errors.txt | 19 +++ ...arationsInForOfShadowing(target=es2022).js | 114 +++++++++++++++++ ...onsInForOfShadowing(target=es5).errors.txt | 19 +++ ...eclarationsInForOfShadowing(target=es5).js | 120 ++++++++++++++++++ ...InForOfShadowing(target=esnext).errors.txt | 19 +++ ...arationsInForOfShadowing(target=esnext).js | 29 +++++ 10 files changed, 586 insertions(+) create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt create mode 100644 tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt new file mode 100644 index 0000000000000..53b53496d45d9 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt @@ -0,0 +1,19 @@ +usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. + + +==== usingDeclarationsInForOfShadowing.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'. + } \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js new file mode 100644 index 0000000000000..e3df5affa540f --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js @@ -0,0 +1,114 @@ +//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// + +//// [usingDeclarationsInForOfShadowing.ts] +class Foo {} + +for (using foo of []) { + const foo = new Foo(); +} + +for (using bar of []) { + let bar = "test"; +} + +for (using baz of []) { + var baz = 42; +} + +//// [usingDeclarationsInForOfShadowing.js] +var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { + if (value !== null && value !== void 0) { + if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); + var dispose, inner; + if (async) { + if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined."); + dispose = value[Symbol.asyncDispose]; + } + if (dispose === void 0) { + if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined."); + dispose = value[Symbol.dispose]; + if (async) inner = dispose; + } + if (typeof dispose !== "function") throw new TypeError("Object not disposable."); + if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } }; + env.stack.push({ value: value, dispose: dispose, async: async }); + } + else if (async) { + env.stack.push({ async: true }); + } + return value; +}; +var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) { + return function (env) { + function fail(e) { + env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e; + env.hasError = true; + } + var r, s = 0; + function next() { + while (r = env.stack.pop()) { + try { + if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next); + if (r.dispose) { + var result = r.dispose.call(r.value); + if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); }); + } + else s |= 1; + } + catch (e) { + fail(e); + } + } + if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve(); + if (env.hasError) throw env.error; + } + return next(); + }; +})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) { + var e = new Error(message); + return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e; +}); +class Foo { +} +for (const foo_1 of []) { + const env_1 = { stack: [], error: void 0, hasError: false }; + try { + const foo = __addDisposableResource(env_1, foo_1, false); + const foo_2 = new Foo(); + } + catch (e_1) { + env_1.error = e_1; + env_1.hasError = true; + } + finally { + __disposeResources(env_1); + } +} +for (const bar_1 of []) { + const env_2 = { stack: [], error: void 0, hasError: false }; + try { + const bar = __addDisposableResource(env_2, bar_1, false); + let bar_2 = "test"; + } + catch (e_2) { + env_2.error = e_2; + env_2.hasError = true; + } + finally { + __disposeResources(env_2); + } +} +for (const baz_1 of []) { + const env_3 = { stack: [], error: void 0, hasError: false }; + try { + const baz = __addDisposableResource(env_3, baz_1, false); + var baz_2 = 42; + } + catch (e_3) { + env_3.error = e_3; + env_3.hasError = true; + } + finally { + __disposeResources(env_3); + } +} diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt new file mode 100644 index 0000000000000..53b53496d45d9 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt @@ -0,0 +1,19 @@ +usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. + + +==== usingDeclarationsInForOfShadowing.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'. + } \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js new file mode 100644 index 0000000000000..e3df5affa540f --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js @@ -0,0 +1,114 @@ +//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// + +//// [usingDeclarationsInForOfShadowing.ts] +class Foo {} + +for (using foo of []) { + const foo = new Foo(); +} + +for (using bar of []) { + let bar = "test"; +} + +for (using baz of []) { + var baz = 42; +} + +//// [usingDeclarationsInForOfShadowing.js] +var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { + if (value !== null && value !== void 0) { + if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); + var dispose, inner; + if (async) { + if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined."); + dispose = value[Symbol.asyncDispose]; + } + if (dispose === void 0) { + if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined."); + dispose = value[Symbol.dispose]; + if (async) inner = dispose; + } + if (typeof dispose !== "function") throw new TypeError("Object not disposable."); + if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } }; + env.stack.push({ value: value, dispose: dispose, async: async }); + } + else if (async) { + env.stack.push({ async: true }); + } + return value; +}; +var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) { + return function (env) { + function fail(e) { + env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e; + env.hasError = true; + } + var r, s = 0; + function next() { + while (r = env.stack.pop()) { + try { + if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next); + if (r.dispose) { + var result = r.dispose.call(r.value); + if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); }); + } + else s |= 1; + } + catch (e) { + fail(e); + } + } + if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve(); + if (env.hasError) throw env.error; + } + return next(); + }; +})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) { + var e = new Error(message); + return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e; +}); +class Foo { +} +for (const foo_1 of []) { + const env_1 = { stack: [], error: void 0, hasError: false }; + try { + const foo = __addDisposableResource(env_1, foo_1, false); + const foo_2 = new Foo(); + } + catch (e_1) { + env_1.error = e_1; + env_1.hasError = true; + } + finally { + __disposeResources(env_1); + } +} +for (const bar_1 of []) { + const env_2 = { stack: [], error: void 0, hasError: false }; + try { + const bar = __addDisposableResource(env_2, bar_1, false); + let bar_2 = "test"; + } + catch (e_2) { + env_2.error = e_2; + env_2.hasError = true; + } + finally { + __disposeResources(env_2); + } +} +for (const baz_1 of []) { + const env_3 = { stack: [], error: void 0, hasError: false }; + try { + const baz = __addDisposableResource(env_3, baz_1, false); + var baz_2 = 42; + } + catch (e_3) { + env_3.error = e_3; + env_3.hasError = true; + } + finally { + __disposeResources(env_3); + } +} diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt new file mode 100644 index 0000000000000..53b53496d45d9 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt @@ -0,0 +1,19 @@ +usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. + + +==== usingDeclarationsInForOfShadowing.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'. + } \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js new file mode 100644 index 0000000000000..e3df5affa540f --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js @@ -0,0 +1,114 @@ +//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// + +//// [usingDeclarationsInForOfShadowing.ts] +class Foo {} + +for (using foo of []) { + const foo = new Foo(); +} + +for (using bar of []) { + let bar = "test"; +} + +for (using baz of []) { + var baz = 42; +} + +//// [usingDeclarationsInForOfShadowing.js] +var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { + if (value !== null && value !== void 0) { + if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); + var dispose, inner; + if (async) { + if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined."); + dispose = value[Symbol.asyncDispose]; + } + if (dispose === void 0) { + if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined."); + dispose = value[Symbol.dispose]; + if (async) inner = dispose; + } + if (typeof dispose !== "function") throw new TypeError("Object not disposable."); + if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } }; + env.stack.push({ value: value, dispose: dispose, async: async }); + } + else if (async) { + env.stack.push({ async: true }); + } + return value; +}; +var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) { + return function (env) { + function fail(e) { + env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e; + env.hasError = true; + } + var r, s = 0; + function next() { + while (r = env.stack.pop()) { + try { + if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next); + if (r.dispose) { + var result = r.dispose.call(r.value); + if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); }); + } + else s |= 1; + } + catch (e) { + fail(e); + } + } + if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve(); + if (env.hasError) throw env.error; + } + return next(); + }; +})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) { + var e = new Error(message); + return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e; +}); +class Foo { +} +for (const foo_1 of []) { + const env_1 = { stack: [], error: void 0, hasError: false }; + try { + const foo = __addDisposableResource(env_1, foo_1, false); + const foo_2 = new Foo(); + } + catch (e_1) { + env_1.error = e_1; + env_1.hasError = true; + } + finally { + __disposeResources(env_1); + } +} +for (const bar_1 of []) { + const env_2 = { stack: [], error: void 0, hasError: false }; + try { + const bar = __addDisposableResource(env_2, bar_1, false); + let bar_2 = "test"; + } + catch (e_2) { + env_2.error = e_2; + env_2.hasError = true; + } + finally { + __disposeResources(env_2); + } +} +for (const baz_1 of []) { + const env_3 = { stack: [], error: void 0, hasError: false }; + try { + const baz = __addDisposableResource(env_3, baz_1, false); + var baz_2 = 42; + } + catch (e_3) { + env_3.error = e_3; + env_3.hasError = true; + } + finally { + __disposeResources(env_3); + } +} diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt new file mode 100644 index 0000000000000..53b53496d45d9 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt @@ -0,0 +1,19 @@ +usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. + + +==== usingDeclarationsInForOfShadowing.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'. + } \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js new file mode 100644 index 0000000000000..c0a0e2db4ef40 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js @@ -0,0 +1,120 @@ +//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// + +//// [usingDeclarationsInForOfShadowing.ts] +class Foo {} + +for (using foo of []) { + const foo = new Foo(); +} + +for (using bar of []) { + let bar = "test"; +} + +for (using baz of []) { + var baz = 42; +} + +//// [usingDeclarationsInForOfShadowing.js] +var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { + if (value !== null && value !== void 0) { + if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); + var dispose, inner; + if (async) { + if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined."); + dispose = value[Symbol.asyncDispose]; + } + if (dispose === void 0) { + if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined."); + dispose = value[Symbol.dispose]; + if (async) inner = dispose; + } + if (typeof dispose !== "function") throw new TypeError("Object not disposable."); + if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } }; + env.stack.push({ value: value, dispose: dispose, async: async }); + } + else if (async) { + env.stack.push({ async: true }); + } + return value; +}; +var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) { + return function (env) { + function fail(e) { + env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e; + env.hasError = true; + } + var r, s = 0; + function next() { + while (r = env.stack.pop()) { + try { + if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next); + if (r.dispose) { + var result = r.dispose.call(r.value); + if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); }); + } + else s |= 1; + } + catch (e) { + fail(e); + } + } + if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve(); + if (env.hasError) throw env.error; + } + return next(); + }; +})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) { + var e = new Error(message); + return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e; +}); +var Foo = /** @class */ (function () { + function Foo() { + } + return Foo; +}()); +for (var _i = 0, _a = []; _i < _a.length; _i++) { + var foo_1 = _a[_i]; + var env_1 = { stack: [], error: void 0, hasError: false }; + try { + var foo = __addDisposableResource(env_1, foo_1, false); + var foo_2 = new Foo(); + } + catch (e_1) { + env_1.error = e_1; + env_1.hasError = true; + } + finally { + __disposeResources(env_1); + } +} +for (var _b = 0, _c = []; _b < _c.length; _b++) { + var bar_1 = _c[_b]; + var env_2 = { stack: [], error: void 0, hasError: false }; + try { + var bar = __addDisposableResource(env_2, bar_1, false); + var bar_2 = "test"; + } + catch (e_2) { + env_2.error = e_2; + env_2.hasError = true; + } + finally { + __disposeResources(env_2); + } +} +for (var _d = 0, _e = []; _d < _e.length; _d++) { + var baz_1 = _e[_d]; + var env_3 = { stack: [], error: void 0, hasError: false }; + try { + var baz_1 = __addDisposableResource(env_3, baz_1, false); + var baz_2 = 42; + } + catch (e_3) { + env_3.error = e_3; + env_3.hasError = true; + } + finally { + __disposeResources(env_3); + } +} diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt new file mode 100644 index 0000000000000..53b53496d45d9 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt @@ -0,0 +1,19 @@ +usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. + + +==== usingDeclarationsInForOfShadowing.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'. + } \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js new file mode 100644 index 0000000000000..04a612dbd6705 --- /dev/null +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js @@ -0,0 +1,29 @@ +//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// + +//// [usingDeclarationsInForOfShadowing.ts] +class Foo {} + +for (using foo of []) { + const foo = new Foo(); +} + +for (using bar of []) { + let bar = "test"; +} + +for (using baz of []) { + var baz = 42; +} + +//// [usingDeclarationsInForOfShadowing.js] +class Foo { +} +for (using foo of []) { + const foo = new Foo(); +} +for (using bar of []) { + let bar = "test"; +} +for (using baz of []) { + var baz = 42; +} From 2738f69f57eb34be261cf5cedf79b44196e6dade Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Jun 2025 17:25:02 +0000 Subject: [PATCH 4/8] Add importHelpers directive and fix line endings Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com> --- ...larationsInForOfShadowing(target=es2015).errors.txt | 10 +++++++--- ...usingDeclarationsInForOfShadowing(target=es2015).js | 10 +++++++--- ...larationsInForOfShadowing(target=es2017).errors.txt | 10 +++++++--- ...usingDeclarationsInForOfShadowing(target=es2017).js | 10 +++++++--- ...larationsInForOfShadowing(target=es2022).errors.txt | 10 +++++++--- ...usingDeclarationsInForOfShadowing(target=es2022).js | 10 +++++++--- ...DeclarationsInForOfShadowing(target=es5).errors.txt | 10 +++++++--- .../usingDeclarationsInForOfShadowing(target=es5).js | 10 +++++++--- ...larationsInForOfShadowing(target=esnext).errors.txt | 10 +++++++--- ...usingDeclarationsInForOfShadowing(target=esnext).js | 10 +++++++--- .../usingDeclarationsInForOfShadowing.ts | 10 ++++++++-- 11 files changed, 78 insertions(+), 32 deletions(-) diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt index 53b53496d45d9..198c10b1b75d0 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt @@ -1,7 +1,7 @@ -usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. +main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. -==== usingDeclarationsInForOfShadowing.ts (1 errors) ==== +==== main.ts (1 errors) ==== class Foo {} for (using foo of []) { @@ -16,4 +16,8 @@ usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize oute var baz = 42; ~~~ !!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. - } \ No newline at end of file + } + +==== tslib.d.ts (0 errors) ==== + export declare function __addDisposableResource(env: any, value: T, async: boolean): T; + export declare function __disposeResources(env: any): void; \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js index e3df5affa540f..f7b53c21cc4c2 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js @@ -1,6 +1,6 @@ //// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// -//// [usingDeclarationsInForOfShadowing.ts] +//// [main.ts] class Foo {} for (using foo of []) { @@ -13,9 +13,13 @@ for (using bar of []) { for (using baz of []) { var baz = 42; -} +} + +//// [tslib.d.ts] +export declare function __addDisposableResource(env: any, value: T, async: boolean): T; +export declare function __disposeResources(env: any): void; -//// [usingDeclarationsInForOfShadowing.js] +//// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { if (value !== null && value !== void 0) { if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt index 53b53496d45d9..198c10b1b75d0 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt @@ -1,7 +1,7 @@ -usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. +main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. -==== usingDeclarationsInForOfShadowing.ts (1 errors) ==== +==== main.ts (1 errors) ==== class Foo {} for (using foo of []) { @@ -16,4 +16,8 @@ usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize oute var baz = 42; ~~~ !!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. - } \ No newline at end of file + } + +==== tslib.d.ts (0 errors) ==== + export declare function __addDisposableResource(env: any, value: T, async: boolean): T; + export declare function __disposeResources(env: any): void; \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js index e3df5affa540f..f7b53c21cc4c2 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js @@ -1,6 +1,6 @@ //// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// -//// [usingDeclarationsInForOfShadowing.ts] +//// [main.ts] class Foo {} for (using foo of []) { @@ -13,9 +13,13 @@ for (using bar of []) { for (using baz of []) { var baz = 42; -} +} + +//// [tslib.d.ts] +export declare function __addDisposableResource(env: any, value: T, async: boolean): T; +export declare function __disposeResources(env: any): void; -//// [usingDeclarationsInForOfShadowing.js] +//// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { if (value !== null && value !== void 0) { if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt index 53b53496d45d9..198c10b1b75d0 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt @@ -1,7 +1,7 @@ -usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. +main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. -==== usingDeclarationsInForOfShadowing.ts (1 errors) ==== +==== main.ts (1 errors) ==== class Foo {} for (using foo of []) { @@ -16,4 +16,8 @@ usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize oute var baz = 42; ~~~ !!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. - } \ No newline at end of file + } + +==== tslib.d.ts (0 errors) ==== + export declare function __addDisposableResource(env: any, value: T, async: boolean): T; + export declare function __disposeResources(env: any): void; \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js index e3df5affa540f..f7b53c21cc4c2 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js @@ -1,6 +1,6 @@ //// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// -//// [usingDeclarationsInForOfShadowing.ts] +//// [main.ts] class Foo {} for (using foo of []) { @@ -13,9 +13,13 @@ for (using bar of []) { for (using baz of []) { var baz = 42; -} +} + +//// [tslib.d.ts] +export declare function __addDisposableResource(env: any, value: T, async: boolean): T; +export declare function __disposeResources(env: any): void; -//// [usingDeclarationsInForOfShadowing.js] +//// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { if (value !== null && value !== void 0) { if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt index 53b53496d45d9..198c10b1b75d0 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt @@ -1,7 +1,7 @@ -usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. +main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. -==== usingDeclarationsInForOfShadowing.ts (1 errors) ==== +==== main.ts (1 errors) ==== class Foo {} for (using foo of []) { @@ -16,4 +16,8 @@ usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize oute var baz = 42; ~~~ !!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. - } \ No newline at end of file + } + +==== tslib.d.ts (0 errors) ==== + export declare function __addDisposableResource(env: any, value: T, async: boolean): T; + export declare function __disposeResources(env: any): void; \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js index c0a0e2db4ef40..85ca43a09883f 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js @@ -1,6 +1,6 @@ //// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// -//// [usingDeclarationsInForOfShadowing.ts] +//// [main.ts] class Foo {} for (using foo of []) { @@ -13,9 +13,13 @@ for (using bar of []) { for (using baz of []) { var baz = 42; -} +} + +//// [tslib.d.ts] +export declare function __addDisposableResource(env: any, value: T, async: boolean): T; +export declare function __disposeResources(env: any): void; -//// [usingDeclarationsInForOfShadowing.js] +//// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { if (value !== null && value !== void 0) { if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected."); diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt index 53b53496d45d9..198c10b1b75d0 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt @@ -1,7 +1,7 @@ -usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. +main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. -==== usingDeclarationsInForOfShadowing.ts (1 errors) ==== +==== main.ts (1 errors) ==== class Foo {} for (using foo of []) { @@ -16,4 +16,8 @@ usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize oute var baz = 42; ~~~ !!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'. - } \ No newline at end of file + } + +==== tslib.d.ts (0 errors) ==== + export declare function __addDisposableResource(env: any, value: T, async: boolean): T; + export declare function __disposeResources(env: any): void; \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js index 04a612dbd6705..2e74200a0d3a7 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js @@ -1,6 +1,6 @@ //// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] //// -//// [usingDeclarationsInForOfShadowing.ts] +//// [main.ts] class Foo {} for (using foo of []) { @@ -13,9 +13,13 @@ for (using bar of []) { for (using baz of []) { var baz = 42; -} +} + +//// [tslib.d.ts] +export declare function __addDisposableResource(env: any, value: T, async: boolean): T; +export declare function __disposeResources(env: any): void; -//// [usingDeclarationsInForOfShadowing.js] +//// [main.js] class Foo { } for (using foo of []) { diff --git a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts index 2eafdebadd958..2a51a6231bd69 100644 --- a/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts +++ b/tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts @@ -1,8 +1,10 @@ // @target: esnext,es2022,es2017,es2015,es5 -// @module: esnext +// @module: commonjs // @lib: esnext +// @importHelpers: true // @noTypesAndSymbols: true +// @filename: main.ts class Foo {} for (using foo of []) { @@ -15,4 +17,8 @@ for (using bar of []) { for (using baz of []) { var baz = 42; -} \ No newline at end of file +} + +// @filename: tslib.d.ts +export declare function __addDisposableResource(env: any, value: T, async: boolean): T; +export declare function __disposeResources(env: any): void; From 8f3df0254408aead0cfddadbe78e530b160675ac Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Jun 2025 19:31:16 +0000 Subject: [PATCH 5/8] Implement block scoping approach for using declaration shadowing in for-of loops Co-authored-by: weswigham <2932786+weswigham@users.noreply.github.com> --- src/compiler/transformers/esnext.ts | 86 +++---------------- ...DeclarationsInForAwaitOf(target=es2015).js | 2 + ...DeclarationsInForAwaitOf(target=es2017).js | 2 + ...DeclarationsInForAwaitOf(target=es2022).js | 2 + ...ingDeclarationsInForAwaitOf(target=es5).js | 2 + ...gDeclarationsInForAwaitOf.3(target=es5).js | 8 +- ...ingDeclarationsInForOf.1(target=es2015).js | 2 + ...ingDeclarationsInForOf.1(target=es2017).js | 2 + ...ingDeclarationsInForOf.1(target=es2022).js | 2 + ...tUsingDeclarationsInForOf.1(target=es5).js | 2 + ...tUsingDeclarationsInForOf.5(target=es5).js | 8 +- ...DeclarationsInForAwaitOf(target=es2015).js | 2 + ...DeclarationsInForAwaitOf(target=es2017).js | 2 + ...DeclarationsInForAwaitOf(target=es2022).js | 2 + ...ingDeclarationsInForAwaitOf(target=es5).js | 2 + ...ingDeclarationsInForOf.1(target=es2015).js | 2 + ...ingDeclarationsInForOf.1(target=es2017).js | 2 + ...ingDeclarationsInForOf.1(target=es2022).js | 2 + .../usingDeclarationsInForOf.1(target=es5).js | 2 + ...InForOfShadowing(target=es2015).errors.txt | 3 +- ...arationsInForOfShadowing(target=es2015).js | 15 +++- ...InForOfShadowing(target=es2017).errors.txt | 3 +- ...arationsInForOfShadowing(target=es2017).js | 15 +++- ...InForOfShadowing(target=es2022).errors.txt | 3 +- ...arationsInForOfShadowing(target=es2022).js | 15 +++- ...onsInForOfShadowing(target=es5).errors.txt | 3 +- ...eclarationsInForOfShadowing(target=es5).js | 15 +++- ...InForOfShadowing(target=esnext).errors.txt | 3 +- ...arationsInForOfShadowing(target=esnext).js | 3 +- 29 files changed, 112 insertions(+), 100 deletions(-) diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index d7519127ed995..2c89d082ae947 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -15,7 +15,6 @@ import { ExportSpecifier, Expression, firstOrUndefined, - forEachChild, ForOfStatement, ForStatement, GeneratedIdentifierFlags, @@ -37,7 +36,6 @@ import { isPrologueDirective, isSourceFile, isStatement, - isVariableDeclaration, isVariableDeclarationList, isVariableStatement, ModifierFlags, @@ -297,55 +295,7 @@ export function transformESNext(context: TransformationContext): (x: SourceFile /** * Collects all variable declarations that shadow a given identifier name in a statement. */ - function collectShadowingVariables(statement: Statement, shadowedName: string): VariableDeclaration[] { - const shadowingVars: VariableDeclaration[] = []; - - function visit(node: Node): void { - if (isVariableStatement(node)) { - for (const declaration of node.declarationList.declarations) { - if (isIdentifier(declaration.name) && declaration.name.escapedText === shadowedName) { - shadowingVars.push(declaration); - } - } - } - forEachChild(node, visit); - } - - visit(statement); - return shadowingVars; - } - /** - * Creates a visitor that renames shadowing variables to avoid conflicts. - */ - function createShadowingVariableRenamer(shadowedName: string): (node: Node) => VisitResult { - const renamingMap = new Map(); - - return function renameShadowingVariables(node: Node): VisitResult { - if (isVariableDeclaration(node) && isIdentifier(node.name) && node.name.escapedText === shadowedName) { - // Create a unique name for this shadowing variable - const uniqueName = factory.createUniqueName(shadowedName as string, GeneratedIdentifierFlags.Optimistic); - renamingMap.set(node.name.escapedText as string, uniqueName); - - return factory.updateVariableDeclaration( - node, - uniqueName, - node.exclamationToken, - node.type, - visitNode(node.initializer, renameShadowingVariables, isExpression) - ); - } - - if (isIdentifier(node)) { - const renamed = renamingMap.get(node.escapedText as string); - if (renamed) { - return renamed; - } - } - - return visitEachChild(node, renameShadowingVariables, context); - }; - } function visitForOfStatement(node: ForOfStatement) { if (isUsingVariableDeclarationList(node.initializer)) { @@ -356,11 +306,12 @@ export function transformESNext(context: TransformationContext): (x: SourceFile // produces a shallow transformation to: // // for (const x_1 of y) { - // using x = x; - // ... + // using x = x_1; + // { ... } // } // - // before handing the shallow transformation back to the visitor for an in-depth transformation. + // where the original loop body is wrapped in an additional block scope + // to handle shadowing variables naturally through block scoping. const forInitializer = node.initializer; const forDecl = firstOrUndefined(forInitializer.declarations) || factory.createVariableDeclaration(factory.createTempVariable(/*recordTempVariable*/ undefined)); @@ -370,18 +321,10 @@ export function transformESNext(context: TransformationContext): (x: SourceFile const usingVarList = factory.createVariableDeclarationList([usingVar], isAwaitUsing ? NodeFlags.AwaitUsing : NodeFlags.Using); const usingVarStatement = factory.createVariableStatement(/*modifiers*/ undefined, usingVarList); - // Check if the loop body contains shadowing variables and rename them if necessary - const shadowedName = isIdentifier(forDecl.name) ? forDecl.name.escapedText as string : undefined; - let transformedStatement = node.statement; - - if (shadowedName) { - const shadowingVars = collectShadowingVariables(node.statement, shadowedName); - if (shadowingVars.length > 0) { - // Apply the renaming visitor to the loop body - const renamer = createShadowingVariableRenamer(shadowedName); - transformedStatement = visitNode(node.statement, renamer, isStatement); - } - } + // Wrap the original loop body in an additional block scope to handle shadowing + const wrappedStatement = isBlock(node.statement) ? + node.statement : + factory.createBlock([node.statement], /*multiLine*/ true); return visitNode( factory.updateForOfStatement( @@ -391,15 +334,10 @@ export function transformESNext(context: TransformationContext): (x: SourceFile factory.createVariableDeclaration(temp), ], NodeFlags.Const), node.expression, - isBlock(transformedStatement) ? - factory.updateBlock(transformedStatement, [ - usingVarStatement, - ...transformedStatement.statements, - ]) : - factory.createBlock([ - usingVarStatement, - transformedStatement, - ], /*multiLine*/ true), + factory.createBlock([ + usingVarStatement, + wrappedStatement, + ], /*multiLine*/ true), ), visitor, isStatement, diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js index aa6dd826bd543..b994b9f538c6a 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js @@ -88,6 +88,8 @@ function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); + { + } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js index 18c95ea8e4fca..e4a640e0ea998 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js @@ -76,6 +76,8 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); + { + } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js index ac74f897e702a..05178b52df577 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js @@ -64,6 +64,8 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js index 4deda344151fc..6a7212e524ace 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js @@ -128,6 +128,8 @@ function main() { case 3: _j.trys.push([3, 4, 5, 8]); d1 = __addDisposableResource(env_1, d1_1, true); + { + } return [3 /*break*/, 8]; case 4: e_1 = _j.sent(); diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js index f929d3d0c6ced..db43dff80b288 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf.3(target=es5).js @@ -118,7 +118,9 @@ try { var env_1 = { stack: [], error: void 0, hasError: false }; try { var _e = __addDisposableResource(env_1, _e_1, true); - ; + { + ; + } } catch (e_2) { env_1.error = e_2; @@ -159,7 +161,9 @@ export function test() { case 3: _f.trys.push([3, 4, 5, 8]); _b = __addDisposableResource(env_2, _b_1, true); - ; + { + ; + } return [3 /*break*/, 8]; case 4: e_3 = _f.sent(); diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js index 9ea879d8b742e..842b9e4efabe6 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js @@ -77,6 +77,8 @@ function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js index 4d81c8b1f5f5f..1befc14d6d791 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js @@ -65,6 +65,8 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js index 4d81c8b1f5f5f..1befc14d6d791 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js @@ -65,6 +65,8 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js index b48951bbe6d5e..898f349ac8e81 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js @@ -117,6 +117,8 @@ function main() { case 2: _d.trys.push([2, 3, 4, 7]); d1 = __addDisposableResource(env_1, d1_1, true); + { + } return [3 /*break*/, 7]; case 3: e_1 = _d.sent(); diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js index 6b9e8308d45a9..bc1a01dae2dbe 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.5(target=es5).js @@ -107,7 +107,9 @@ for (var _i = 0, x_1 = x; _i < x_1.length; _i++) { var env_1 = { stack: [], error: void 0, hasError: false }; try { var _a = __addDisposableResource(env_1, _a_1, true); - ; + { + ; + } } catch (e_1) { env_1.error = e_1; @@ -135,7 +137,9 @@ export function test() { case 2: _b.trys.push([2, 3, 4, 7]); _a = __addDisposableResource(env_2, _a_2, true); - ; + { + ; + } return [3 /*break*/, 7]; case 3: e_2 = _b.sent(); diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js index 52a0d20d1efc6..75740f92dd8fd 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js @@ -87,6 +87,8 @@ function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js index 9d4fa33d6ef25..1438154e3b881 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js @@ -77,6 +77,8 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js index 353ac015ec2ee..3466b93376457 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js @@ -65,6 +65,8 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js index 31d3c5ab036bb..63b53693efb4e 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js @@ -123,6 +123,8 @@ function main() { env_1 = { stack: [], error: void 0, hasError: false }; try { d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js index 3ae4724bd550a..974b23c8cc512 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js @@ -62,6 +62,8 @@ for (const d1_1 of [{ [Symbol.dispose]() { } }, null, undefined]) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js index 3ae4724bd550a..974b23c8cc512 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js @@ -62,6 +62,8 @@ for (const d1_1 of [{ [Symbol.dispose]() { } }, null, undefined]) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js index 3ae4724bd550a..974b23c8cc512 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js @@ -62,6 +62,8 @@ for (const d1_1 of [{ [Symbol.dispose]() { } }, null, undefined]) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js index caec071966fdd..245ad434ecb02 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js @@ -64,6 +64,8 @@ for (var _i = 0, _b = [(_a = {}, _a[Symbol.dispose] = function () { }, _a), null var env_1 = { stack: [], error: void 0, hasError: false }; try { var d1 = __addDisposableResource(env_1, d1_1, false); + { + } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt index 198c10b1b75d0..9ff1e77bc34d6 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt @@ -20,4 +20,5 @@ main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in th ==== tslib.d.ts (0 errors) ==== export declare function __addDisposableResource(env: any, value: T, async: boolean): T; - export declare function __disposeResources(env: any): void; \ No newline at end of file + export declare function __disposeResources(env: any): void; + \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js index f7b53c21cc4c2..c7aa6cbd2433b 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js @@ -17,7 +17,8 @@ for (using baz of []) { //// [tslib.d.ts] export declare function __addDisposableResource(env: any, value: T, async: boolean): T; -export declare function __disposeResources(env: any): void; +export declare function __disposeResources(env: any): void; + //// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { @@ -78,7 +79,9 @@ for (const foo_1 of []) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const foo = __addDisposableResource(env_1, foo_1, false); - const foo_2 = new Foo(); + { + const foo = new Foo(); + } } catch (e_1) { env_1.error = e_1; @@ -92,7 +95,9 @@ for (const bar_1 of []) { const env_2 = { stack: [], error: void 0, hasError: false }; try { const bar = __addDisposableResource(env_2, bar_1, false); - let bar_2 = "test"; + { + let bar = "test"; + } } catch (e_2) { env_2.error = e_2; @@ -106,7 +111,9 @@ for (const baz_1 of []) { const env_3 = { stack: [], error: void 0, hasError: false }; try { const baz = __addDisposableResource(env_3, baz_1, false); - var baz_2 = 42; + { + var baz = 42; + } } catch (e_3) { env_3.error = e_3; diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt index 198c10b1b75d0..9ff1e77bc34d6 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt @@ -20,4 +20,5 @@ main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in th ==== tslib.d.ts (0 errors) ==== export declare function __addDisposableResource(env: any, value: T, async: boolean): T; - export declare function __disposeResources(env: any): void; \ No newline at end of file + export declare function __disposeResources(env: any): void; + \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js index f7b53c21cc4c2..c7aa6cbd2433b 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js @@ -17,7 +17,8 @@ for (using baz of []) { //// [tslib.d.ts] export declare function __addDisposableResource(env: any, value: T, async: boolean): T; -export declare function __disposeResources(env: any): void; +export declare function __disposeResources(env: any): void; + //// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { @@ -78,7 +79,9 @@ for (const foo_1 of []) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const foo = __addDisposableResource(env_1, foo_1, false); - const foo_2 = new Foo(); + { + const foo = new Foo(); + } } catch (e_1) { env_1.error = e_1; @@ -92,7 +95,9 @@ for (const bar_1 of []) { const env_2 = { stack: [], error: void 0, hasError: false }; try { const bar = __addDisposableResource(env_2, bar_1, false); - let bar_2 = "test"; + { + let bar = "test"; + } } catch (e_2) { env_2.error = e_2; @@ -106,7 +111,9 @@ for (const baz_1 of []) { const env_3 = { stack: [], error: void 0, hasError: false }; try { const baz = __addDisposableResource(env_3, baz_1, false); - var baz_2 = 42; + { + var baz = 42; + } } catch (e_3) { env_3.error = e_3; diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt index 198c10b1b75d0..9ff1e77bc34d6 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt @@ -20,4 +20,5 @@ main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in th ==== tslib.d.ts (0 errors) ==== export declare function __addDisposableResource(env: any, value: T, async: boolean): T; - export declare function __disposeResources(env: any): void; \ No newline at end of file + export declare function __disposeResources(env: any): void; + \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js index f7b53c21cc4c2..c7aa6cbd2433b 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).js @@ -17,7 +17,8 @@ for (using baz of []) { //// [tslib.d.ts] export declare function __addDisposableResource(env: any, value: T, async: boolean): T; -export declare function __disposeResources(env: any): void; +export declare function __disposeResources(env: any): void; + //// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { @@ -78,7 +79,9 @@ for (const foo_1 of []) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const foo = __addDisposableResource(env_1, foo_1, false); - const foo_2 = new Foo(); + { + const foo = new Foo(); + } } catch (e_1) { env_1.error = e_1; @@ -92,7 +95,9 @@ for (const bar_1 of []) { const env_2 = { stack: [], error: void 0, hasError: false }; try { const bar = __addDisposableResource(env_2, bar_1, false); - let bar_2 = "test"; + { + let bar = "test"; + } } catch (e_2) { env_2.error = e_2; @@ -106,7 +111,9 @@ for (const baz_1 of []) { const env_3 = { stack: [], error: void 0, hasError: false }; try { const baz = __addDisposableResource(env_3, baz_1, false); - var baz_2 = 42; + { + var baz = 42; + } } catch (e_3) { env_3.error = e_3; diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt index 198c10b1b75d0..9ff1e77bc34d6 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).errors.txt @@ -20,4 +20,5 @@ main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in th ==== tslib.d.ts (0 errors) ==== export declare function __addDisposableResource(env: any, value: T, async: boolean): T; - export declare function __disposeResources(env: any): void; \ No newline at end of file + export declare function __disposeResources(env: any): void; + \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js index 85ca43a09883f..be5771ac0a662 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es5).js @@ -17,7 +17,8 @@ for (using baz of []) { //// [tslib.d.ts] export declare function __addDisposableResource(env: any, value: T, async: boolean): T; -export declare function __disposeResources(env: any): void; +export declare function __disposeResources(env: any): void; + //// [main.js] var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) { @@ -82,7 +83,9 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var env_1 = { stack: [], error: void 0, hasError: false }; try { var foo = __addDisposableResource(env_1, foo_1, false); - var foo_2 = new Foo(); + { + var foo_2 = new Foo(); + } } catch (e_1) { env_1.error = e_1; @@ -97,7 +100,9 @@ for (var _b = 0, _c = []; _b < _c.length; _b++) { var env_2 = { stack: [], error: void 0, hasError: false }; try { var bar = __addDisposableResource(env_2, bar_1, false); - var bar_2 = "test"; + { + var bar_2 = "test"; + } } catch (e_2) { env_2.error = e_2; @@ -112,7 +117,9 @@ for (var _d = 0, _e = []; _d < _e.length; _d++) { var env_3 = { stack: [], error: void 0, hasError: false }; try { var baz_1 = __addDisposableResource(env_3, baz_1, false); - var baz_2 = 42; + { + var baz = 42; + } } catch (e_3) { env_3.error = e_3; diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt index 198c10b1b75d0..9ff1e77bc34d6 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).errors.txt @@ -20,4 +20,5 @@ main.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in th ==== tslib.d.ts (0 errors) ==== export declare function __addDisposableResource(env: any, value: T, async: boolean): T; - export declare function __disposeResources(env: any): void; \ No newline at end of file + export declare function __disposeResources(env: any): void; + \ No newline at end of file diff --git a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js index 2e74200a0d3a7..ac64cb95ffa91 100644 --- a/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js +++ b/tests/baselines/reference/usingDeclarationsInForOfShadowing(target=esnext).js @@ -17,7 +17,8 @@ for (using baz of []) { //// [tslib.d.ts] export declare function __addDisposableResource(env: any, value: T, async: boolean): T; -export declare function __disposeResources(env: any): void; +export declare function __disposeResources(env: any): void; + //// [main.js] class Foo { From 0b3bf33a8eaabc4bc8b0887c8b21cb98d3c9b029 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Jun 2025 20:46:24 +0000 Subject: [PATCH 6/8] Fix empty block generation in using declaration for-of loops and remove obsolete comment Co-authored-by: weswigham <2932786+weswigham@users.noreply.github.com> --- src/compiler/transformers/esnext.ts | 24 +++++++++---------- ...DeclarationsInForAwaitOf(target=es2015).js | 2 -- ...DeclarationsInForAwaitOf(target=es2017).js | 2 -- ...DeclarationsInForAwaitOf(target=es2022).js | 2 -- ...ingDeclarationsInForAwaitOf(target=es5).js | 2 -- ...ingDeclarationsInForOf.1(target=es2015).js | 2 -- ...ingDeclarationsInForOf.1(target=es2017).js | 2 -- ...ingDeclarationsInForOf.1(target=es2022).js | 2 -- ...tUsingDeclarationsInForOf.1(target=es5).js | 2 -- ...DeclarationsInForAwaitOf(target=es2015).js | 2 -- ...DeclarationsInForAwaitOf(target=es2017).js | 2 -- ...DeclarationsInForAwaitOf(target=es2022).js | 2 -- ...ingDeclarationsInForAwaitOf(target=es5).js | 2 -- ...ingDeclarationsInForOf.1(target=es2015).js | 2 -- ...ingDeclarationsInForOf.1(target=es2017).js | 2 -- ...ingDeclarationsInForOf.1(target=es2022).js | 2 -- .../usingDeclarationsInForOf.1(target=es5).js | 2 -- 17 files changed, 12 insertions(+), 44 deletions(-) diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index 2c89d082ae947..0cdb03ad253cc 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -292,11 +292,6 @@ export function transformESNext(context: TransformationContext): (x: SourceFile return visitEachChild(node, visitor, context); } - /** - * Collects all variable declarations that shadow a given identifier name in a statement. - */ - - function visitForOfStatement(node: ForOfStatement) { if (isUsingVariableDeclarationList(node.initializer)) { // given: @@ -322,9 +317,17 @@ export function transformESNext(context: TransformationContext): (x: SourceFile const usingVarStatement = factory.createVariableStatement(/*modifiers*/ undefined, usingVarList); // Wrap the original loop body in an additional block scope to handle shadowing - const wrappedStatement = isBlock(node.statement) ? - node.statement : - factory.createBlock([node.statement], /*multiLine*/ true); + // Don't create an extra block if the original statement is empty + const isEmptyBlock = isBlock(node.statement) && node.statement.statements.length === 0; + const shouldWrapInBlock = !isEmptyBlock; + + const statements: Statement[] = [usingVarStatement]; + if (shouldWrapInBlock) { + const wrappedStatement = isBlock(node.statement) ? + node.statement : + factory.createBlock([node.statement], /*multiLine*/ true); + statements.push(wrappedStatement); + } return visitNode( factory.updateForOfStatement( @@ -334,10 +337,7 @@ export function transformESNext(context: TransformationContext): (x: SourceFile factory.createVariableDeclaration(temp), ], NodeFlags.Const), node.expression, - factory.createBlock([ - usingVarStatement, - wrappedStatement, - ], /*multiLine*/ true), + factory.createBlock(statements, /*multiLine*/ true), ), visitor, isStatement, diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js index b994b9f538c6a..aa6dd826bd543 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2015).js @@ -88,8 +88,6 @@ function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); - { - } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js index e4a640e0ea998..18c95ea8e4fca 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2017).js @@ -76,8 +76,6 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); - { - } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js index 05178b52df577..ac74f897e702a 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es2022).js @@ -64,8 +64,6 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js index 6a7212e524ace..4deda344151fc 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForAwaitOf(target=es5).js @@ -128,8 +128,6 @@ function main() { case 3: _j.trys.push([3, 4, 5, 8]); d1 = __addDisposableResource(env_1, d1_1, true); - { - } return [3 /*break*/, 8]; case 4: e_1 = _j.sent(); diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js index 842b9e4efabe6..9ea879d8b742e 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2015).js @@ -77,8 +77,6 @@ function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js index 1befc14d6d791..4d81c8b1f5f5f 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2017).js @@ -65,8 +65,6 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js index 1befc14d6d791..4d81c8b1f5f5f 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es2022).js @@ -65,8 +65,6 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, true); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js index 898f349ac8e81..b48951bbe6d5e 100644 --- a/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js +++ b/tests/baselines/reference/awaitUsingDeclarationsInForOf.1(target=es5).js @@ -117,8 +117,6 @@ function main() { case 2: _d.trys.push([2, 3, 4, 7]); d1 = __addDisposableResource(env_1, d1_1, true); - { - } return [3 /*break*/, 7]; case 3: e_1 = _d.sent(); diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js index 75740f92dd8fd..52a0d20d1efc6 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2015).js @@ -87,8 +87,6 @@ function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js index 1438154e3b881..9d4fa33d6ef25 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2017).js @@ -77,8 +77,6 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js index 3466b93376457..353ac015ec2ee 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es2022).js @@ -65,8 +65,6 @@ async function main() { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js index 63b53693efb4e..31d3c5ab036bb 100644 --- a/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForAwaitOf(target=es5).js @@ -123,8 +123,6 @@ function main() { env_1 = { stack: [], error: void 0, hasError: false }; try { d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_2) { env_1.error = e_2; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js index 974b23c8cc512..3ae4724bd550a 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2015).js @@ -62,8 +62,6 @@ for (const d1_1 of [{ [Symbol.dispose]() { } }, null, undefined]) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js index 974b23c8cc512..3ae4724bd550a 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2017).js @@ -62,8 +62,6 @@ for (const d1_1 of [{ [Symbol.dispose]() { } }, null, undefined]) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js index 974b23c8cc512..3ae4724bd550a 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es2022).js @@ -62,8 +62,6 @@ for (const d1_1 of [{ [Symbol.dispose]() { } }, null, undefined]) { const env_1 = { stack: [], error: void 0, hasError: false }; try { const d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_1) { env_1.error = e_1; diff --git a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js index 245ad434ecb02..caec071966fdd 100644 --- a/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js +++ b/tests/baselines/reference/usingDeclarationsInForOf.1(target=es5).js @@ -64,8 +64,6 @@ for (var _i = 0, _b = [(_a = {}, _a[Symbol.dispose] = function () { }, _a), null var env_1 = { stack: [], error: void 0, hasError: false }; try { var d1 = __addDisposableResource(env_1, d1_1, false); - { - } } catch (e_1) { env_1.error = e_1; From 957cf79304a041ec6506fd06bc24c0de59da2a31 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Jun 2025 21:09:09 +0000 Subject: [PATCH 7/8] Fix empty statement handling in using declaration for-of loops Co-authored-by: weswigham <2932786+weswigham@users.noreply.github.com> --- src/compiler/transformers/esnext.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index 0cdb03ad253cc..7b5aeb3bdd160 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -317,8 +317,11 @@ export function transformESNext(context: TransformationContext): (x: SourceFile const usingVarStatement = factory.createVariableStatement(/*modifiers*/ undefined, usingVarList); // Wrap the original loop body in an additional block scope to handle shadowing - // Don't create an extra block if the original statement is empty - const isEmptyBlock = isBlock(node.statement) && node.statement.statements.length === 0; + // Don't create an extra block if the original statement is empty or contains only empty statements + const isEmptyBlock = isBlock(node.statement) && ( + node.statement.statements.length === 0 || + node.statement.statements.every(stmt => stmt.kind === SyntaxKind.EmptyStatement) + ); const shouldWrapInBlock = !isEmptyBlock; const statements: Statement[] = [usingVarStatement]; From 88c9bfa63906667163b2db9da41ac97018e0cd10 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Jun 2025 21:10:16 +0000 Subject: [PATCH 8/8] Fix trailing whitespace in esnext.ts Co-authored-by: weswigham <2932786+weswigham@users.noreply.github.com> --- src/compiler/transformers/esnext.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index 7b5aeb3bdd160..2b6ca480e32fc 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -319,7 +319,7 @@ export function transformESNext(context: TransformationContext): (x: SourceFile // Wrap the original loop body in an additional block scope to handle shadowing // Don't create an extra block if the original statement is empty or contains only empty statements const isEmptyBlock = isBlock(node.statement) && ( - node.statement.statements.length === 0 || + node.statement.statements.length === 0 || node.statement.statements.every(stmt => stmt.kind === SyntaxKind.EmptyStatement) ); const shouldWrapInBlock = !isEmptyBlock;