microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 12:32:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Limit decorator use-before-def check to ES decorators only (#57933)

Browse Source
This commit is contained in:
Ron Buckton 2024-03-25 14:31:17 -04:00 committed by GitHub
parent 0d4414d10d
commit 64a00106a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 55 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/checker.ts
View File

@ -2838,7 +2838,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const container = findAncestor(usage, n =>
n === declaration ? "quit" :
isComputedPropertyName(n) ? n.parent.parent === declaration :
isDecorator(n) && (n.parent === declaration ||
!legacyDecorators && isDecorator(n) && (n.parent === declaration ||
isMethodDeclaration(n.parent) && n.parent.parent === declaration ||
isGetOrSetAccessorDeclaration(n.parent) && n.parent.parent === declaration ||
isPropertyDeclaration(n.parent) && n.parent.parent === declaration ||
@ -2846,7 +2846,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (!container) {
return true;
}
if (isDecorator(container)) {
if (!legacyDecorators && isDecorator(container)) {
return !!findAncestor(usage, n => n === container ? "quit" : isFunctionLike(n) && !getImmediatelyInvokedFunctionExpression(n));
}
return false;

95
tests/baselines/reference/useBeforeDeclaration_classDecorators.2.errors.txt → tests/baselines/reference/useBeforeDeclaration_classDecorators.2(experimentaldecorators=false).errors.txt
View File

@ -1,40 +1,37 @@
useBeforeDeclaration_classDecorators.2.ts(7,6): error TS2449: Class 'C2' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(10,13): error TS2449: Class 'C3' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(16,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
useBeforeDeclaration_classDecorators.2.ts(22,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
useBeforeDeclaration_classDecorators.2.ts(26,17): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(27,20): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(28,13): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(33,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(34,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(35,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
useBeforeDeclaration_classDecorators.2.ts(35,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(36,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(37,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(39,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(40,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(41,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
useBeforeDeclaration_classDecorators.2.ts(41,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(42,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(43,10): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(46,22): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(47,25): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(48,18): error TS2449: Class 'C5' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(46,17): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(47,20): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(48,13): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(53,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(54,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(55,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
useBeforeDeclaration_classDecorators.2.ts(55,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(56,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(57,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(59,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(60,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(61,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
useBeforeDeclaration_classDecorators.2.ts(61,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(62,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(63,17): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(66,29): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(67,32): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used before its declaration.
useBeforeDeclaration_classDecorators.2.ts(66,17): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(67,20): error TS1206: Decorators are not valid here.
useBeforeDeclaration_classDecorators.2.ts(68,13): error TS1206: Decorators are not valid here.
==== useBeforeDeclaration_classDecorators.2.ts (34 errors) ====
==== useBeforeDeclaration_classDecorators.2.ts (31 errors) ====
declare const dec: any;
// ok
@ -55,24 +52,26 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
// ok
class C4 {
@dec(() => C4) static method() {}
@dec(() => C4) static get x() { return this.y; }
@dec(() => C4) static set x(v) {}
~
!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
@dec(() => C4) static get w() { return this.y; }
@dec(() => C4) static set x(v: any) {}
@dec(() => C4) static y: any;
@dec(() => C4) static accessor z: any;
@dec(() => C4) method() {}
@dec(() => C4) get x() { return this.y; }
@dec(() => C4) set x(v) {}
~
!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
@dec(() => C4) get w() { return this.y; }
@dec(() => C4) set x(v: any) {}
@dec(() => C4) y: any;
@dec(() => C4) accessor z: any;
constructor(@dec(() => C4) a: any) {}
~
!!! error TS1206: Decorators are not valid here.
static method2(@dec(() => C4) a: any) {}
~
!!! error TS1206: Decorators are not valid here.
method2(@dec(() => C4) a: any) {}
~
!!! error TS1206: Decorators are not valid here.
}
// error
@ -81,13 +80,11 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
@dec(C5) static get x() { return this.y; }
@dec(C5) static get w() { return this.y; }
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
@dec(C5) static set x(v) {}
~
!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
@dec(C5) static set x(v: any) {}
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
@ -104,13 +101,11 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
@dec(C5) get x() { return this.y; }
@dec(C5) get w() { return this.y; }
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
@dec(C5) set x(v) {}
~
!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
@dec(C5) set x(v: any) {}
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
@ -125,17 +120,14 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
constructor(@dec(C5) a: any) {}
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
~
!!! error TS1206: Decorators are not valid here.
static method2(@dec(C5) a: any) {}
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
~
!!! error TS1206: Decorators are not valid here.
method2(@dec(C5) a: any) {}
~~
!!! error TS2449: Class 'C5' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:32:7: 'C5' is declared here.
~
!!! error TS1206: Decorators are not valid here.
}
// error
@ -144,13 +136,11 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
@dec((() => C6)()) static get x() { return this.y; }
@dec((() => C6)()) static get w() { return this.y; }
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
@dec((() => C6)()) static set x(v) {}
~
!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
@dec((() => C6)()) static set x(v: any) {}
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
@ -167,13 +157,11 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
@dec((() => C6)()) get x() { return this.y; }
@dec((() => C6)()) get w() { return this.y; }
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
@dec((() => C6)()) set x(v) {}
~
!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
@dec((() => C6)()) set x(v: any) {}
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
@ -188,16 +176,13 @@ useBeforeDeclaration_classDecorators.2.ts(68,25): error TS2449: Class 'C6' used
constructor(@dec((() => C6)()) a: any) {}
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
~
!!! error TS1206: Decorators are not valid here.
static method2(@dec((() => C6)()) a: any) {}
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
~
!!! error TS1206: Decorators are not valid here.
method2(@dec((() => C6)()) a: any) {}
~~
!!! error TS2449: Class 'C6' used before its declaration.
!!! related TS2728 useBeforeDeclaration_classDecorators.2.ts:52:7: 'C6' is declared here.
~
!!! error TS1206: Decorators are not valid here.
}

26
tests/cases/compiler/useBeforeDeclaration_classDecorators.2.ts
View File

@ -1,7 +1,7 @@
// @target: esnext
// @noEmit: true
// @noTypesAndSymbols: true
// @experimentalDecorators: true
// @experimentalDecorators: *
declare const dec: any;
@ -17,14 +17,14 @@ declare const dec: any;
// ok
class C4 {
@dec(() => C4) static method() {}
@dec(() => C4) static get x() { return this.y; }
@dec(() => C4) static set x(v) {}
@dec(() => C4) static get w() { return this.y; }
@dec(() => C4) static set x(v: any) {}
@dec(() => C4) static y: any;
@dec(() => C4) static accessor z: any;
@dec(() => C4) method() {}
@dec(() => C4) get x() { return this.y; }
@dec(() => C4) set x(v) {}
@dec(() => C4) get w() { return this.y; }
@dec(() => C4) set x(v: any) {}
@dec(() => C4) y: any;
@dec(() => C4) accessor z: any;
@ -36,14 +36,14 @@ class C4 {
// error
class C5 {
@dec(C5) static method() {}
@dec(C5) static get x() { return this.y; }
@dec(C5) static set x(v) {}
@dec(C5) static get w() { return this.y; }
@dec(C5) static set x(v: any) {}
@dec(C5) static y: any;
@dec(C5) static accessor z: any;
@dec(C5) method() {}
@dec(C5) get x() { return this.y; }
@dec(C5) set x(v) {}
@dec(C5) get w() { return this.y; }
@dec(C5) set x(v: any) {}
@dec(C5) y: any;
@dec(C5) accessor z: any;
@ -56,14 +56,14 @@ class C5 {
// error
class C6 {
@dec((() => C6)()) static method() {}
@dec((() => C6)()) static get x() { return this.y; }
@dec((() => C6)()) static set x(v) {}
@dec((() => C6)()) static get w() { return this.y; }
@dec((() => C6)()) static set x(v: any) {}
@dec((() => C6)()) static y: any;
@dec((() => C6)()) static accessor z: any;
@dec((() => C6)()) method() {}
@dec((() => C6)()) get x() { return this.y; }
@dec((() => C6)()) set x(v) {}
@dec((() => C6)()) get w() { return this.y; }
@dec((() => C6)()) set x(v: any) {}
@dec((() => C6)()) y: any;
@dec((() => C6)()) accessor z: any;