Skip to content

Commit 6fead46

Browse files
CopilotRyanCavanaugh
Copilot
and
RyanCavanaugh
committed
Add test baselines for using declaration shadowing fix
Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
1 parent 237579e commit 6fead46

10 files changed

Lines changed: 586 additions & 0 deletions

‎tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).errors.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'.
2+
3+
4+
==== usingDeclarationsInForOfShadowing.ts (1 errors) ====
5+
class Foo {}
6+
7+
for (using foo of []) {
8+
const foo = new Foo();
9+
}
10+
11+
for (using bar of []) {
12+
let bar = "test";
13+
}
14+
15+
for (using baz of []) {
16+
var baz = 42;
17+
~~~
18+
!!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'.
19+
}

‎tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2015).js‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] ////
2+
3+
//// [usingDeclarationsInForOfShadowing.ts]
4+
class Foo {}
5+
6+
for (using foo of []) {
7+
const foo = new Foo();
8+
}
9+
10+
for (using bar of []) {
11+
let bar = "test";
12+
}
13+
14+
for (using baz of []) {
15+
var baz = 42;
16+
}
17+
18+
//// [usingDeclarationsInForOfShadowing.js]
19+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
20+
if (value !== null && value !== void 0) {
21+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
22+
var dispose, inner;
23+
if (async) {
24+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
25+
dispose = value[Symbol.asyncDispose];
26+
}
27+
if (dispose === void 0) {
28+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
29+
dispose = value[Symbol.dispose];
30+
if (async) inner = dispose;
31+
}
32+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
33+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
34+
env.stack.push({ value: value, dispose: dispose, async: async });
35+
}
36+
else if (async) {
37+
env.stack.push({ async: true });
38+
}
39+
return value;
40+
};
41+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
42+
return function (env) {
43+
function fail(e) {
44+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
45+
env.hasError = true;
46+
}
47+
var r, s = 0;
48+
function next() {
49+
while (r = env.stack.pop()) {
50+
try {
51+
if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
52+
if (r.dispose) {
53+
var result = r.dispose.call(r.value);
54+
if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
55+
}
56+
else s |= 1;
57+
}
58+
catch (e) {
59+
fail(e);
60+
}
61+
}
62+
if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
63+
if (env.hasError) throw env.error;
64+
}
65+
return next();
66+
};
67+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
68+
var e = new Error(message);
69+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
70+
});
71+
class Foo {
72+
}
73+
for (const foo_1 of []) {
74+
const env_1 = { stack: [], error: void 0, hasError: false };
75+
try {
76+
const foo = __addDisposableResource(env_1, foo_1, false);
77+
const foo_2 = new Foo();
78+
}
79+
catch (e_1) {
80+
env_1.error = e_1;
81+
env_1.hasError = true;
82+
}
83+
finally {
84+
__disposeResources(env_1);
85+
}
86+
}
87+
for (const bar_1 of []) {
88+
const env_2 = { stack: [], error: void 0, hasError: false };
89+
try {
90+
const bar = __addDisposableResource(env_2, bar_1, false);
91+
let bar_2 = "test";
92+
}
93+
catch (e_2) {
94+
env_2.error = e_2;
95+
env_2.hasError = true;
96+
}
97+
finally {
98+
__disposeResources(env_2);
99+
}
100+
}
101+
for (const baz_1 of []) {
102+
const env_3 = { stack: [], error: void 0, hasError: false };
103+
try {
104+
const baz = __addDisposableResource(env_3, baz_1, false);
105+
var baz_2 = 42;
106+
}
107+
catch (e_3) {
108+
env_3.error = e_3;
109+
env_3.hasError = true;
110+
}
111+
finally {
112+
__disposeResources(env_3);
113+
}
114+
}

‎tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).errors.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'.
2+
3+
4+
==== usingDeclarationsInForOfShadowing.ts (1 errors) ====
5+
class Foo {}
6+
7+
for (using foo of []) {
8+
const foo = new Foo();
9+
}
10+
11+
for (using bar of []) {
12+
let bar = "test";
13+
}
14+
15+
for (using baz of []) {
16+
var baz = 42;
17+
~~~
18+
!!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'.
19+
}

‎tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2017).js‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOfShadowing.ts] ////
2+
3+
//// [usingDeclarationsInForOfShadowing.ts]
4+
class Foo {}
5+
6+
for (using foo of []) {
7+
const foo = new Foo();
8+
}
9+
10+
for (using bar of []) {
11+
let bar = "test";
12+
}
13+
14+
for (using baz of []) {
15+
var baz = 42;
16+
}
17+
18+
//// [usingDeclarationsInForOfShadowing.js]
19+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
20+
if (value !== null && value !== void 0) {
21+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
22+
var dispose, inner;
23+
if (async) {
24+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
25+
dispose = value[Symbol.asyncDispose];
26+
}
27+
if (dispose === void 0) {
28+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
29+
dispose = value[Symbol.dispose];
30+
if (async) inner = dispose;
31+
}
32+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
33+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
34+
env.stack.push({ value: value, dispose: dispose, async: async });
35+
}
36+
else if (async) {
37+
env.stack.push({ async: true });
38+
}
39+
return value;
40+
};
41+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
42+
return function (env) {
43+
function fail(e) {
44+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
45+
env.hasError = true;
46+
}
47+
var r, s = 0;
48+
function next() {
49+
while (r = env.stack.pop()) {
50+
try {
51+
if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
52+
if (r.dispose) {
53+
var result = r.dispose.call(r.value);
54+
if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
55+
}
56+
else s |= 1;
57+
}
58+
catch (e) {
59+
fail(e);
60+
}
61+
}
62+
if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
63+
if (env.hasError) throw env.error;
64+
}
65+
return next();
66+
};
67+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
68+
var e = new Error(message);
69+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
70+
});
71+
class Foo {
72+
}
73+
for (const foo_1 of []) {
74+
const env_1 = { stack: [], error: void 0, hasError: false };
75+
try {
76+
const foo = __addDisposableResource(env_1, foo_1, false);
77+
const foo_2 = new Foo();
78+
}
79+
catch (e_1) {
80+
env_1.error = e_1;
81+
env_1.hasError = true;
82+
}
83+
finally {
84+
__disposeResources(env_1);
85+
}
86+
}
87+
for (const bar_1 of []) {
88+
const env_2 = { stack: [], error: void 0, hasError: false };
89+
try {
90+
const bar = __addDisposableResource(env_2, bar_1, false);
91+
let bar_2 = "test";
92+
}
93+
catch (e_2) {
94+
env_2.error = e_2;
95+
env_2.hasError = true;
96+
}
97+
finally {
98+
__disposeResources(env_2);
99+
}
100+
}
101+
for (const baz_1 of []) {
102+
const env_3 = { stack: [], error: void 0, hasError: false };
103+
try {
104+
const baz = __addDisposableResource(env_3, baz_1, false);
105+
var baz_2 = 42;
106+
}
107+
catch (e_3) {
108+
env_3.error = e_3;
109+
env_3.hasError = true;
110+
}
111+
finally {
112+
__disposeResources(env_3);
113+
}
114+
}

‎tests/baselines/reference/usingDeclarationsInForOfShadowing(target=es2022).errors.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
usingDeclarationsInForOfShadowing.ts(12,7): error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'.
2+
3+
4+
==== usingDeclarationsInForOfShadowing.ts (1 errors) ====
5+
class Foo {}
6+
7+
for (using foo of []) {
8+
const foo = new Foo();
9+
}
10+
11+
for (using bar of []) {
12+
let bar = "test";
13+
}
14+
15+
for (using baz of []) {
16+
var baz = 42;
17+
~~~
18+
!!! error TS2481: Cannot initialize outer scoped variable 'baz' in the same scope as block scoped declaration 'baz'.
19+
}

0 commit comments

Comments
 (0)