microsoft
diff --git a/‎src/compiler/checker.ts
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions b/‎src/compiler/checker.ts
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
-4Lines changed: 0 additions & 4 deletions b/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
-4Lines changed: 0 additions & 4 deletions
diff --git a/‎tests/baselines/reference/abstractPropertyNegative.errors.txt
Copy file name to clipboard
+2-5Lines changed: 2 additions & 5 deletions b/‎tests/baselines/reference/abstractPropertyNegative.errors.txt
Copy file name to clipboard
+2-5Lines changed: 2 additions & 5 deletions
diff --git a/‎tests/baselines/reference/abstractPropertyNegative.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎tests/baselines/reference/abstractPropertyNegative.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/baselines/reference/abstractPropertyNegative.symbols
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎tests/baselines/reference/abstractPropertyNegative.symbols
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/baselines/reference/abstractPropertyNegative.types
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎tests/baselines/reference/abstractPropertyNegative.types
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/baselines/reference/divergentAccessorsTypes6.errors.txt
Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions b/‎tests/baselines/reference/divergentAccessorsTypes6.errors.txt
Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions
diff --git a/‎tests/baselines/reference/divergentAccessorsTypes6.js
Copy file name to clipboard
+58Lines changed: 58 additions & 0 deletions b/‎tests/baselines/reference/divergentAccessorsTypes6.js
Copy file name to clipboard
+58Lines changed: 58 additions & 0 deletions
diff --git a/‎tests/baselines/reference/divergentAccessorsTypes6.symbols
Copy file name to clipboard
+91Lines changed: 91 additions & 0 deletions b/‎tests/baselines/reference/divergentAccessorsTypes6.symbols
Copy file name to clipboard
+91Lines changed: 91 additions & 0 deletions
diff --git a/‎tests/baselines/reference/divergentAccessorsTypes6.types
Copy file name to clipboard
+89Lines changed: 89 additions & 0 deletions b/‎tests/baselines/reference/divergentAccessorsTypes6.types
Copy file name to clipboard
+89Lines changed: 89 additions & 0 deletions
@@ -38507,12 +38507,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                         error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
                         error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
                     }
-
-                    const getterType = getAnnotatedAccessorType(getter);
-                    const setterType = getAnnotatedAccessorType(setter);
-                    if (getterType && setterType) {
-                        checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-                    }
                 }
             }
             const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
 
@@ -1972,10 +1972,6 @@
         "category": "Error",
         "code": 2379
     },
-    "The return type of a 'get' accessor must be assignable to its 'set' accessor type": {
-        "category": "Error",
-        "code": 2380
-    },
     "Overload signatures must all be exported or non-exported.": {
         "category": "Error",
         "code": 2383
 
@@ -1,4 +1,3 @@
-tests/cases/compiler/abstractPropertyNegative.ts(10,18): error TS2380: The return type of a 'get' accessor must be assignable to its 'set' accessor type
 tests/cases/compiler/abstractPropertyNegative.ts(13,7): error TS18052: Non-abstract class 'C' does not implement all abstract members of 'B'
 tests/cases/compiler/abstractPropertyNegative.ts(15,5): error TS1253: Abstract properties can only appear within an abstract class.
 tests/cases/compiler/abstractPropertyNegative.ts(16,37): error TS1005: '{' expected.
@@ -15,7 +14,7 @@ tests/cases/compiler/abstractPropertyNegative.ts(40,9): error TS2676: Accessors
 tests/cases/compiler/abstractPropertyNegative.ts(41,18): error TS2676: Accessors must both be abstract or non-abstract.
 
 
-==== tests/cases/compiler/abstractPropertyNegative.ts (12 errors) ====
+==== tests/cases/compiler/abstractPropertyNegative.ts (11 errors) ====
     interface A {
         prop: string;
         m(): string;
@@ -26,9 +25,7 @@ tests/cases/compiler/abstractPropertyNegative.ts(41,18): error TS2676: Accessors
         abstract get readonlyProp(): string;
         abstract m(): string;
         abstract get mismatch(): string;
-                     ~~~~~~~~
-!!! error TS2380: The return type of a 'get' accessor must be assignable to its 'set' accessor type
-        abstract set mismatch(val: number); // error, not same type
+        abstract set mismatch(val: number);
     }
     class C extends B {
           ~
 
@@ -9,7 +9,7 @@ abstract class B implements A {
     abstract get readonlyProp(): string;
     abstract m(): string;
     abstract get mismatch(): string;
-    abstract set mismatch(val: number); // error, not same type
+    abstract set mismatch(val: number);
 }
 class C extends B {
     readonly ro = "readonly please";
 
@@ -27,7 +27,7 @@ abstract class B implements A {
     abstract get mismatch(): string;
 >mismatch : Symbol(B.mismatch, Decl(abstractPropertyNegative.ts, 8, 25), Decl(abstractPropertyNegative.ts, 9, 36))
 
-    abstract set mismatch(val: number); // error, not same type
+    abstract set mismatch(val: number);
 >mismatch : Symbol(B.mismatch, Decl(abstractPropertyNegative.ts, 8, 25), Decl(abstractPropertyNegative.ts, 9, 36))
 >val : Symbol(val, Decl(abstractPropertyNegative.ts, 10, 26))
 }
 
@@ -24,7 +24,7 @@ abstract class B implements A {
     abstract get mismatch(): string;
 >mismatch : string
 
-    abstract set mismatch(val: number); // error, not same type
+    abstract set mismatch(val: number);
 >mismatch : string
 >val : number
 }
 
@@ -0,0 +1,50 @@
+tests/cases/compiler/divergentAccessorsTypes6.ts(11,1): error TS2322: Type 'CSSStyleDeclaration' is not assignable to type 'string'.
+tests/cases/compiler/divergentAccessorsTypes6.ts(19,23): error TS2344: Type 'string' does not satisfy the constraint 'never'.
+tests/cases/compiler/divergentAccessorsTypes6.ts(23,23): error TS2344: Type 'string' does not satisfy the constraint 'never'.
+tests/cases/compiler/divergentAccessorsTypes6.ts(29,16): error TS2322: Type 'number' is not assignable to type 'string'.
+
+
+==== tests/cases/compiler/divergentAccessorsTypes6.ts (4 errors) ====
+    export {};
+    
+    interface Element {
+        get style(): CSSStyleDeclaration;
+        set style(cssText: string);
+    }
+    
+    declare const element: Element;
+    element.style = "color: red";
+    element.style.animationTimingFunction;
+    element.style = element.style; // error
+    ~~~~~~~~~~~~~
+!!! error TS2322: Type 'CSSStyleDeclaration' is not assignable to type 'string'.
+    
+    // Now that we don't check for getter/setter assignability, we should
+    // ensure the setter annotation is actually checked even if it's never observed.
+    
+    type Fail<T extends never> = T;
+    interface I1 {
+        get x(): number;
+        set x(value: Fail<string>);
+                          ~~~~~~
+!!! error TS2344: Type 'string' does not satisfy the constraint 'never'.
+    }
+    const o1 = {
+        get x(): number { return 0; },
+        set x(value: Fail<string>) {}
+                          ~~~~~~
+!!! error TS2344: Type 'string' does not satisfy the constraint 'never'.
+    }
+    
+    // A setter annotation still implies the getter return type.
+    
+    const o2 = {
+        get p1() { return 0; }, // error - no annotation means type is implied from the setter annotation
+                   ~~~~~~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+        set p1(value: string) {},
+    
+        get p2(): number { return 0; }, // ok - explicit annotation
+        set p2(value: string) {},
+    };
+    
@@ -0,0 +1,58 @@
+//// [divergentAccessorsTypes6.ts]
+export {};
+
+interface Element {
+    get style(): CSSStyleDeclaration;
+    set style(cssText: string);
+}
+
+declare const element: Element;
+element.style = "color: red";
+element.style.animationTimingFunction;
+element.style = element.style; // error
+
+// Now that we don't check for getter/setter assignability, we should
+// ensure the setter annotation is actually checked even if it's never observed.
+
+type Fail<T extends never> = T;
+interface I1 {
+    get x(): number;
+    set x(value: Fail<string>);
+}
+const o1 = {
+    get x(): number { return 0; },
+    set x(value: Fail<string>) {}
+}
+
+// A setter annotation still implies the getter return type.
+
+const o2 = {
+    get p1() { return 0; }, // error - no annotation means type is implied from the setter annotation
+    set p1(value: string) {},
+
+    get p2(): number { return 0; }, // ok - explicit annotation
+    set p2(value: string) {},
+};
+
+
+//// [divergentAccessorsTypes6.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+element.style = "color: red";
+element.style.animationTimingFunction;
+element.style = element.style; // error
+var o1 = {
+    get x() { return 0; },
+    set x(value) { }
+};
+// A setter annotation still implies the getter return type.
+var o2 = {
+    get p1() { return 0; },
+    set p1(value) { },
+    get p2() { return 0; },
+    set p2(value) { },
+};
+
+
+//// [divergentAccessorsTypes6.d.ts]
+export {};
@@ -0,0 +1,91 @@
+=== tests/cases/compiler/divergentAccessorsTypes6.ts ===
+export {};
+
+interface Element {
+>Element : Symbol(Element, Decl(divergentAccessorsTypes6.ts, 0, 10))
+
+    get style(): CSSStyleDeclaration;
+>style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>CSSStyleDeclaration : Symbol(CSSStyleDeclaration, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+
+    set style(cssText: string);
+>style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>cssText : Symbol(cssText, Decl(divergentAccessorsTypes6.ts, 4, 14))
+}
+
+declare const element: Element;
+>element : Symbol(element, Decl(divergentAccessorsTypes6.ts, 7, 13))
+>Element : Symbol(Element, Decl(divergentAccessorsTypes6.ts, 0, 10))
+
+element.style = "color: red";
+>element.style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>element : Symbol(element, Decl(divergentAccessorsTypes6.ts, 7, 13))
+>style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+
+element.style.animationTimingFunction;
+>element.style.animationTimingFunction : Symbol(CSSStyleDeclaration.animationTimingFunction, Decl(lib.dom.d.ts, --, --))
+>element.style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>element : Symbol(element, Decl(divergentAccessorsTypes6.ts, 7, 13))
+>style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>animationTimingFunction : Symbol(CSSStyleDeclaration.animationTimingFunction, Decl(lib.dom.d.ts, --, --))
+
+element.style = element.style; // error
+>element.style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>element : Symbol(element, Decl(divergentAccessorsTypes6.ts, 7, 13))
+>style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>element.style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+>element : Symbol(element, Decl(divergentAccessorsTypes6.ts, 7, 13))
+>style : Symbol(Element.style, Decl(divergentAccessorsTypes6.ts, 2, 19), Decl(divergentAccessorsTypes6.ts, 3, 37))
+
+// Now that we don't check for getter/setter assignability, we should
+// ensure the setter annotation is actually checked even if it's never observed.
+
+type Fail<T extends never> = T;
+>Fail : Symbol(Fail, Decl(divergentAccessorsTypes6.ts, 10, 30))
+>T : Symbol(T, Decl(divergentAccessorsTypes6.ts, 15, 10))
+>T : Symbol(T, Decl(divergentAccessorsTypes6.ts, 15, 10))
+
+interface I1 {
+>I1 : Symbol(I1, Decl(divergentAccessorsTypes6.ts, 15, 31))
+
+    get x(): number;
+>x : Symbol(I1.x, Decl(divergentAccessorsTypes6.ts, 16, 14), Decl(divergentAccessorsTypes6.ts, 17, 20))
+
+    set x(value: Fail<string>);
+>x : Symbol(I1.x, Decl(divergentAccessorsTypes6.ts, 16, 14), Decl(divergentAccessorsTypes6.ts, 17, 20))
+>value : Symbol(value, Decl(divergentAccessorsTypes6.ts, 18, 10))
+>Fail : Symbol(Fail, Decl(divergentAccessorsTypes6.ts, 10, 30))
+}
+const o1 = {
+>o1 : Symbol(o1, Decl(divergentAccessorsTypes6.ts, 20, 5))
+
+    get x(): number { return 0; },
+>x : Symbol(x, Decl(divergentAccessorsTypes6.ts, 20, 12), Decl(divergentAccessorsTypes6.ts, 21, 34))
+
+    set x(value: Fail<string>) {}
+>x : Symbol(x, Decl(divergentAccessorsTypes6.ts, 20, 12), Decl(divergentAccessorsTypes6.ts, 21, 34))
+>value : Symbol(value, Decl(divergentAccessorsTypes6.ts, 22, 10))
+>Fail : Symbol(Fail, Decl(divergentAccessorsTypes6.ts, 10, 30))
+}
+
+// A setter annotation still implies the getter return type.
+
+const o2 = {
+>o2 : Symbol(o2, Decl(divergentAccessorsTypes6.ts, 27, 5))
+
+    get p1() { return 0; }, // error - no annotation means type is implied from the setter annotation
+>p1 : Symbol(p1, Decl(divergentAccessorsTypes6.ts, 27, 12), Decl(divergentAccessorsTypes6.ts, 28, 27))
+
+    set p1(value: string) {},
+>p1 : Symbol(p1, Decl(divergentAccessorsTypes6.ts, 27, 12), Decl(divergentAccessorsTypes6.ts, 28, 27))
+>value : Symbol(value, Decl(divergentAccessorsTypes6.ts, 29, 11))
+
+    get p2(): number { return 0; }, // ok - explicit annotation
+>p2 : Symbol(p2, Decl(divergentAccessorsTypes6.ts, 29, 29), Decl(divergentAccessorsTypes6.ts, 31, 35))
+
+    set p2(value: string) {},
+>p2 : Symbol(p2, Decl(divergentAccessorsTypes6.ts, 29, 29), Decl(divergentAccessorsTypes6.ts, 31, 35))
+>value : Symbol(value, Decl(divergentAccessorsTypes6.ts, 32, 11))
+
+};
+
@@ -0,0 +1,89 @@
+=== tests/cases/compiler/divergentAccessorsTypes6.ts ===
+export {};
+
+interface Element {
+    get style(): CSSStyleDeclaration;
+>style : CSSStyleDeclaration
+
+    set style(cssText: string);
+>style : CSSStyleDeclaration
+>cssText : string
+}
+
+declare const element: Element;
+>element : Element
+
+element.style = "color: red";
+>element.style = "color: red" : "color: red"
+>element.style : string
+>element : Element
+>style : string
+>"color: red" : "color: red"
+
+element.style.animationTimingFunction;
+>element.style.animationTimingFunction : string
+>element.style : CSSStyleDeclaration
+>element : Element
+>style : CSSStyleDeclaration
+>animationTimingFunction : string
+
+element.style = element.style; // error
+>element.style = element.style : CSSStyleDeclaration
+>element.style : string
+>element : Element
+>style : string
+>element.style : CSSStyleDeclaration
+>element : Element
+>style : CSSStyleDeclaration
+
+// Now that we don't check for getter/setter assignability, we should
+// ensure the setter annotation is actually checked even if it's never observed.
+
+type Fail<T extends never> = T;
+>Fail : T
+
+interface I1 {
+    get x(): number;
+>x : number
+
+    set x(value: Fail<string>);
+>x : number
+>value : string
+}
+const o1 = {
+>o1 : { x: number; }
+>{    get x(): number { return 0; },    set x(value: Fail<string>) {}} : { x: number; }
+
+    get x(): number { return 0; },
+>x : number
+>0 : 0
+
+    set x(value: Fail<string>) {}
+>x : number
+>value : string
+}
+
+// A setter annotation still implies the getter return type.
+
+const o2 = {
+>o2 : { p1: string; p2: number; }
+>{    get p1() { return 0; }, // error - no annotation means type is implied from the setter annotation    set p1(value: string) {},    get p2(): number { return 0; }, // ok - explicit annotation    set p2(value: string) {},} : { p1: string; p2: number; }
+
+    get p1() { return 0; }, // error - no annotation means type is implied from the setter annotation
+>p1 : string
+>0 : 0
+
+    set p1(value: string) {},
+>p1 : string
+>value : string
+
+    get p2(): number { return 0; }, // ok - explicit annotation
+>p2 : number
+>0 : 0
+
+    set p2(value: string) {},
+>p2 : number
+>value : string
+
+};
+
Original file line number	Diff line number	Diff line change
`@@ -38507,12 +38507,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`38507`	`38507`	`error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);`
`38508`	`38508`	`error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);`
`38509`	`38509`	`}`
`38510`		`-`
`38511`		`- const getterType = getAnnotatedAccessorType(getter);`
`38512`		`- const setterType = getAnnotatedAccessorType(setter);`
`38513`		`- if (getterType && setterType) {`
`38514`		`- checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);`
`38515`		`- }`
`38516`	`38510`	`}`
`38517`	`38511`	`}`
`38518`	`38512`	`const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ abstract class B implements A {`
`9`	`9`	`abstract get readonlyProp(): string;`
`10`	`10`	`abstract m(): string;`
`11`	`11`	`abstract get mismatch(): string;`
`12`		`- abstract set mismatch(val: number); // error, not same type`
	`12`	`+ abstract set mismatch(val: number);`
`13`	`13`	`}`
`14`	`14`	`class C extends B {`
`15`	`15`	`readonly ro = "readonly please";`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ abstract class B implements A {`
`27`	`27`	`abstract get mismatch(): string;`
`28`	`28`	`>mismatch : Symbol(B.mismatch, Decl(abstractPropertyNegative.ts, 8, 25), Decl(abstractPropertyNegative.ts, 9, 36))`
`29`	`29`
`30`		`- abstract set mismatch(val: number); // error, not same type`
	`30`	`+ abstract set mismatch(val: number);`
`31`	`31`	`>mismatch : Symbol(B.mismatch, Decl(abstractPropertyNegative.ts, 8, 25), Decl(abstractPropertyNegative.ts, 9, 36))`
`32`	`32`	`>val : Symbol(val, Decl(abstractPropertyNegative.ts, 10, 26))`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ abstract class B implements A {`
`24`	`24`	`abstract get mismatch(): string;`
`25`	`25`	`>mismatch : string`
`26`	`26`
`27`		`- abstract set mismatch(val: number); // error, not same type`
	`27`	`+ abstract set mismatch(val: number);`
`28`	`28`	`>mismatch : string`
`29`	`29`	`>val : number`
`30`	`30`	`}`