update baseline

src/compiler/checker.ts

@@ -34319,7 +34319,8 @@ namespace ts {
             checkClassForDuplicateDeclarations(node);
 
             // Only check for reserved static identifiers on non-ambient context.
-            if (!(node.flags & NodeFlags.Ambient)) {
+            const nodeInAmbientContext = !!(node.flags & NodeFlags.Ambient)
+            if (!nodeInAmbientContext) {
                 checkClassForStaticPropertyNameConflicts(node);
             }
 
@@ -34375,7 +34376,7 @@ namespace ts {
                 }
             }
 
-            if (compilerOptions.pedanticOverride) {
+            if (compilerOptions.pedanticOverride && !nodeInAmbientContext) {
                 issueMemberWithOverride(node, type, typeWithThis);
             }
 

tests/baselines/reference/override3.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/conformance/override/override3.ts(7,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override3.ts(22,5): error TS4113: Method must have override modifier because it's override the base class 'D'.
 
 
 ==== tests/cases/conformance/override/override3.ts (1 errors) ====
@@ -9,8 +9,6 @@ tests/cases/conformance/override/override3.ts(7,5): error TS4113: Method must ha
 
     declare class D extends B {
         foo (): void;
-        ~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
         override bar (): void;
     }
 
@@ -23,4 +21,11 @@ tests/cases/conformance/override/override3.ts(7,5): error TS4113: Method must ha
         override foo(): void {}
         override bar(): void {}
     }
+
+    class EB extends D {
+        foo(): void {}
+        ~~~
+!!! error TS4113: Method must have override modifier because it's override the base class 'D'.
+        override bar(): void {}
+    }
 

tests/baselines/reference/override3.js

@@ -18,6 +18,11 @@ class DD extends D {
     override foo(): void {}
     override bar(): void {}
 }
+
+class EB extends D {
+    foo(): void {}
+    override bar(): void {}
+}
 
 
 //// [override3.js]
@@ -52,6 +57,15 @@ var DD = /** @class */ (function (_super) {
     DD.prototype.bar = function () { };
     return DD;
 }(D));
+var EB = /** @class */ (function (_super) {
+    __extends(EB, _super);
+    function EB() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    EB.prototype.foo = function () { };
+    EB.prototype.bar = function () { };
+    return EB;
+}(D));
 
 
 //// [override3.d.ts]
@@ -71,3 +85,7 @@ declare class DD extends D {
     override foo(): void;
     override bar(): void;
 }
+declare class EB extends D {
+    foo(): void;
+    override bar(): void;
+}

tests/baselines/reference/override3.symbols

@@ -42,3 +42,14 @@ class DD extends D {
 >bar : Symbol(DD.bar, Decl(override3.ts, 16, 27))
 }
 
+class EB extends D {
+>EB : Symbol(EB, Decl(override3.ts, 18, 1))
+>D : Symbol(D, Decl(override3.ts, 3, 1))
+
+    foo(): void {}
+>foo : Symbol(EB.foo, Decl(override3.ts, 20, 20))
+
+    override bar(): void {}
+>bar : Symbol(EB.bar, Decl(override3.ts, 21, 18))
+}
+

tests/baselines/reference/override3.types

@@ -42,3 +42,14 @@ class DD extends D {
 >bar : () => void
 }
 
+class EB extends D {
+>EB : EB
+>D : D
+
+    foo(): void {}
+>foo : () => void
+
+    override bar(): void {}
+>bar : () => void
+}
+

tests/baselines/reference/override5.errors.txt

@@ -0,0 +1,17 @@
+tests/cases/conformance/override/override5.ts(9,22): error TS4114: Override modifier cannot be used with declare modifier.
+
+
+==== tests/cases/conformance/override/override5.ts (1 errors) ====
+    class B {
+        p1: number = 1;
+        p2: number = 2;
+    }
+
+    class D extends B{
+        declare p1: number
+
+        override declare p2: number
+                         ~~
+!!! error TS4114: Override modifier cannot be used with declare modifier.
+    }
+

tests/baselines/reference/override5.js

@@ -0,0 +1,52 @@
+//// [override5.ts]
+class B {
+    p1: number = 1;
+    p2: number = 2;
+}
+
+class D extends B{
+    declare p1: number
+
+    override declare p2: number
+}
+
+
+//// [override5.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var B = /** @class */ (function () {
+    function B() {
+        this.p1 = 1;
+        this.p2 = 2;
+    }
+    return B;
+}());
+var D = /** @class */ (function (_super) {
+    __extends(D, _super);
+    function D() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return D;
+}(B));
+
+
+//// [override5.d.ts]
+declare class B {
+    p1: number;
+    p2: number;
+}
+declare class D extends B {
+    p1: number;
+    override p2: number;
+}

tests/baselines/reference/override5.symbols

@@ -0,0 +1,22 @@
+=== tests/cases/conformance/override/override5.ts ===
+class B {
+>B : Symbol(B, Decl(override5.ts, 0, 0))
+
+    p1: number = 1;
+>p1 : Symbol(B.p1, Decl(override5.ts, 0, 9))
+
+    p2: number = 2;
+>p2 : Symbol(B.p2, Decl(override5.ts, 1, 19))
+}
+
+class D extends B{
+>D : Symbol(D, Decl(override5.ts, 3, 1))
+>B : Symbol(B, Decl(override5.ts, 0, 0))
+
+    declare p1: number
+>p1 : Symbol(D.p1, Decl(override5.ts, 5, 18))
+
+    override declare p2: number
+>p2 : Symbol(D.p2, Decl(override5.ts, 6, 22))
+}
+

tests/baselines/reference/override5.types

@@ -0,0 +1,24 @@
+=== tests/cases/conformance/override/override5.ts ===
+class B {
+>B : B
+
+    p1: number = 1;
+>p1 : number
+>1 : 1
+
+    p2: number = 2;
+>p2 : number
+>2 : 2
+}
+
+class D extends B{
+>D : D
+>B : B
+
+    declare p1: number
+>p1 : number
+
+    override declare p2: number
+>p2 : number
+}
+

tests/cases/conformance/override/override3.ts

@@ -19,3 +19,8 @@ class DD extends D {
     override foo(): void {}
     override bar(): void {}
 }
+
+class EB extends D {
+    foo(): void {}
+    override bar(): void {}
+}