From c55ef92fed700340ddc58a22c9101537a42465b6 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 2 Nov 2022 19:23:14 -0700 Subject: [PATCH] Reduce usage of invalid property overrides (#165293) With native property fields, a few of our properties are no longer valid. This either removes them or switches them to use declare instead --- src/vs/base/browser/ui/tree/asyncDataTree.ts | 2 +- src/vs/base/browser/ui/tree/dataTree.ts | 2 +- src/vs/base/browser/ui/tree/indexTree.ts | 2 +- src/vs/base/browser/ui/tree/objectTree.ts | 4 ++-- .../electron-sandbox/extensionTipsService.ts | 2 -- src/vs/platform/list/browser/listService.ts | 4 ++-- src/vs/workbench/browser/web.main.ts | 2 +- src/vs/workbench/contrib/tasks/common/tasks.ts | 6 +++--- .../electron-sandbox/extensionTipsService.ts | 2 -- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts index a8b846793039f..63d1d9e011302 100644 --- a/src/vs/base/browser/ui/tree/asyncDataTree.ts +++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts @@ -1150,7 +1150,7 @@ export interface ICompressibleAsyncDataTreeOptionsUpdate extends IAsyncDataTreeO export class CompressibleAsyncDataTree extends AsyncDataTree { - protected override readonly tree!: CompressibleObjectTree, TFilterData>; + protected declare readonly tree: CompressibleObjectTree, TFilterData>; protected readonly compressibleNodeMapper: CompressibleAsyncDataTreeNodeMapper = new WeakMapper(node => new CompressibleAsyncDataTreeNodeWrapper(node)); private filter?: ITreeFilter; diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts index 4dfe854ec0420..06b8e2339ec8e 100644 --- a/src/vs/base/browser/ui/tree/dataTree.ts +++ b/src/vs/base/browser/ui/tree/dataTree.ts @@ -16,7 +16,7 @@ export interface IDataTreeOptions extends IAbstractTreeOp export class DataTree extends AbstractTree { - protected override model!: ObjectTreeModel; + protected declare model: ObjectTreeModel; private input: TInput | undefined; private identityProvider: IIdentityProvider | undefined; diff --git a/src/vs/base/browser/ui/tree/indexTree.ts b/src/vs/base/browser/ui/tree/indexTree.ts index 38a141fe88bdf..cf86858ca5146 100644 --- a/src/vs/base/browser/ui/tree/indexTree.ts +++ b/src/vs/base/browser/ui/tree/indexTree.ts @@ -14,7 +14,7 @@ export interface IIndexTreeOptions extends IAbstractTreeO export class IndexTree extends AbstractTree { - protected override model!: IndexTreeModel; + protected declare model: IndexTreeModel; constructor( user: string, diff --git a/src/vs/base/browser/ui/tree/objectTree.ts b/src/vs/base/browser/ui/tree/objectTree.ts index bd4aa34b2c7a4..c6be2d0f4ff48 100644 --- a/src/vs/base/browser/ui/tree/objectTree.ts +++ b/src/vs/base/browser/ui/tree/objectTree.ts @@ -45,7 +45,7 @@ export interface IObjectTreeViewState { export class ObjectTree, TFilterData = void> extends AbstractTree { - protected override model!: IObjectTreeModel; + protected declare model: IObjectTreeModel; override get onDidChangeCollapseState(): Event> { return this.model.onDidChangeCollapseState; } @@ -197,7 +197,7 @@ export interface ICompressibleObjectTreeOptionsUpdate extends IAbstractTreeOptio export class CompressibleObjectTree, TFilterData = void> extends ObjectTree implements ICompressedTreeNodeProvider { - protected override model!: CompressibleObjectTreeModel; + protected declare model: CompressibleObjectTreeModel; constructor( user: string, diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts index fdfb6721b9a76..a5f8f0a7972ea 100644 --- a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts +++ b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts @@ -44,8 +44,6 @@ const lastPromptedMediumImpExeTimeStorageKey = 'extensionTips/lastPromptedMedium export class ExtensionTipsService extends BaseExtensionTipsService { - override _serviceBrand: any; - private readonly highImportanceExecutableTips: Map = new Map(); private readonly mediumImportanceExecutableTips: Map = new Map(); private readonly allOtherExecutableTips: Map = new Map(); diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index 5fb143fc948ce..180b544463f71 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -782,7 +782,7 @@ class ListResourceNavigator extends ResourceNavigator { class TableResourceNavigator extends ResourceNavigator { - protected override readonly widget!: Table; + protected declare readonly widget: Table; constructor( widget: Table, @@ -798,7 +798,7 @@ class TableResourceNavigator extends ResourceNavigator { class TreeResourceNavigator extends ResourceNavigator { - protected override readonly widget!: ObjectTree | CompressibleObjectTree | DataTree | AsyncDataTree | CompressibleAsyncDataTree; + protected declare readonly widget: ObjectTree | CompressibleObjectTree | DataTree | AsyncDataTree | CompressibleAsyncDataTree; constructor( widget: ObjectTree | CompressibleObjectTree | DataTree | AsyncDataTree | CompressibleAsyncDataTree, diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts index f1172f3566793..da874609806fc 100644 --- a/src/vs/workbench/browser/web.main.ts +++ b/src/vs/workbench/browser/web.main.ts @@ -197,7 +197,7 @@ export class BrowserMain extends Disposable { } return new class extends DisposableTunnel implements ITunnel { - override localAddress!: string; + declare localAddress: string; }({ port: tunnel.tunnelRemotePort, host: tunnel.tunnelRemoteHost }, tunnel.localAddress, () => tunnel.dispose()); } }, diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts index b6a5922064ec7..c53dd0ea6444e 100644 --- a/src/vs/workbench/contrib/tasks/common/tasks.ts +++ b/src/vs/workbench/contrib/tasks/common/tasks.ts @@ -701,7 +701,7 @@ export abstract class CommonTask { */ export class CustomTask extends CommonTask { - override type!: '$customized'; // CUSTOMIZED_TASK_TYPE + declare type: '$customized'; // CUSTOMIZED_TASK_TYPE instance: number | undefined; @@ -903,7 +903,7 @@ export class ContributedTask extends CommonTask { * Indicated the source of the task (e.g. tasks.json or extension) * Set in the super constructor */ - override _source!: IExtensionTaskSource; + declare _source: IExtensionTaskSource; instance: number | undefined; @@ -997,7 +997,7 @@ export class InMemoryTask extends CommonTask { instance: number | undefined; - override type!: 'inMemory'; + declare type: 'inMemory'; public constructor(id: string, source: IInMemoryTaskSource, label: string, type: string, runOptions: IRunOptions, configurationProperties: IConfigurationProperties) { diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts index fa12c6b9d1391..b89795c0fe880 100644 --- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts @@ -17,8 +17,6 @@ import { Schemas } from 'vs/base/common/network'; class NativeExtensionTipsService extends ExtensionTipsService implements IExtensionTipsService { - override _serviceBrand: any; - private readonly channel: IChannel; constructor(