From 5b5868d59211ff6114d2e6e7f0d3d3971bb0cbc7 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 7 Jun 2021 21:05:50 +0200 Subject: [PATCH] refactor(zone.js): ensure compatibility with noImplicitOverride (#42512) Adds the `override` keyword to the `zone.js` sources to ensure compatibility with `noImplicitOverride`. PR Close #42512 --- packages/zone.js/test/common/Error.spec.ts | 20 ++++++++++---------- packages/zone.js/test/common/Promise.spec.ts | 2 +- packages/zone.js/test/common/util.spec.ts | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/zone.js/test/common/Error.spec.ts b/packages/zone.js/test/common/Error.spec.ts index 19dca94f48..ed377237e0 100644 --- a/packages/zone.js/test/common/Error.spec.ts +++ b/packages/zone.js/test/common/Error.spec.ts @@ -19,22 +19,22 @@ class BaseError extends Error { this._nativeError = nativeError; } - get message() { + override get message() { return this._nativeError.message; } - set message(message) { + override set message(message) { this._nativeError.message = message; } - get name() { + override get name() { return this._nativeError.name; } - get stack() { + override get stack() { return (this._nativeError as any).stack; } - set stack(value) { + override set stack(value) { (this._nativeError as any).stack = value; } - toString() { + override toString() { return this._nativeError.toString(); } } @@ -47,7 +47,7 @@ class WrappedError extends BaseError { this.originalError = error; } - get stack() { + override get stack() { return ((this.originalError instanceof Error ? this.originalError : this._nativeError) as any) .stack; } @@ -58,7 +58,7 @@ class TestError extends WrappedError { super(`${message} caused by: ${error instanceof Error ? error.message : error}`, error); } - get message() { + override get message() { return 'test ' + this.originalError.message; } } @@ -68,11 +68,11 @@ class TestMessageError extends WrappedError { super(`${message} caused by: ${error instanceof Error ? error.message : error}`, error); } - get message() { + override get message() { return 'test ' + this.originalError.message; } - set message(value) { + override set message(value) { this.originalError.message = value; } } diff --git a/packages/zone.js/test/common/Promise.spec.ts b/packages/zone.js/test/common/Promise.spec.ts index 323972d016..e2f9bbdc09 100644 --- a/packages/zone.js/test/common/Promise.spec.ts +++ b/packages/zone.js/test/common/Promise.spec.ts @@ -122,7 +122,7 @@ describe( super(fn); } - static get[Symbol.species]() { + static override get[Symbol.species]() { return MyPromise; } } diff --git a/packages/zone.js/test/common/util.spec.ts b/packages/zone.js/test/common/util.spec.ts index c790f360ef..727e5454cb 100644 --- a/packages/zone.js/test/common/util.spec.ts +++ b/packages/zone.js/test/common/util.spec.ts @@ -91,7 +91,7 @@ describe('utils', function() { } } class ChildType extends Type { - method(..._args: any[]) { + override method(..._args: any[]) { childArgs = _args; childSelf = this; return 'ChildOK';