Skip to content

Commit c55ef92

Browse files
authored
Reduce usage of invalid property overrides (microsoft#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
1 parent d9ed6d1 commit c55ef92

File tree

9 files changed

+11
-15
lines changed

9 files changed

+11
-15
lines changed

src/vs/base/browser/ui/tree/asyncDataTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ export interface ICompressibleAsyncDataTreeOptionsUpdate extends IAsyncDataTreeO
11501150

11511151
export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends AsyncDataTree<TInput, T, TFilterData> {
11521152

1153-
protected override readonly tree!: CompressibleObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData>;
1153+
protected declare readonly tree: CompressibleObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData>;
11541154
protected readonly compressibleNodeMapper: CompressibleAsyncDataTreeNodeMapper<TInput, T, TFilterData> = new WeakMapper(node => new CompressibleAsyncDataTreeNodeWrapper(node));
11551155
private filter?: ITreeFilter<T, TFilterData>;
11561156

src/vs/base/browser/ui/tree/dataTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface IDataTreeOptions<T, TFilterData = void> extends IAbstractTreeOp
1616

1717
export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
1818

19-
protected override model!: ObjectTreeModel<T, TFilterData>;
19+
protected declare model: ObjectTreeModel<T, TFilterData>;
2020
private input: TInput | undefined;
2121

2222
private identityProvider: IIdentityProvider<T> | undefined;

src/vs/base/browser/ui/tree/indexTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface IIndexTreeOptions<T, TFilterData = void> extends IAbstractTreeO
1414

1515
export class IndexTree<T, TFilterData = void> extends AbstractTree<T, TFilterData, number[]> {
1616

17-
protected override model!: IndexTreeModel<T, TFilterData>;
17+
protected declare model: IndexTreeModel<T, TFilterData>;
1818

1919
constructor(
2020
user: string,

src/vs/base/browser/ui/tree/objectTree.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export interface IObjectTreeViewState {
4545

4646
export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
4747

48-
protected override model!: IObjectTreeModel<T, TFilterData>;
48+
protected declare model: IObjectTreeModel<T, TFilterData>;
4949

5050
override get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T | null, TFilterData>> { return this.model.onDidChangeCollapseState; }
5151

@@ -197,7 +197,7 @@ export interface ICompressibleObjectTreeOptionsUpdate extends IAbstractTreeOptio
197197

198198
export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = void> extends ObjectTree<T, TFilterData> implements ICompressedTreeNodeProvider<T, TFilterData> {
199199

200-
protected override model!: CompressibleObjectTreeModel<T, TFilterData>;
200+
protected declare model: CompressibleObjectTreeModel<T, TFilterData>;
201201

202202
constructor(
203203
user: string,

src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ const lastPromptedMediumImpExeTimeStorageKey = 'extensionTips/lastPromptedMedium
4444

4545
export class ExtensionTipsService extends BaseExtensionTipsService {
4646

47-
override _serviceBrand: any;
48-
4947
private readonly highImportanceExecutableTips: Map<string, IExeBasedExtensionTips> = new Map<string, IExeBasedExtensionTips>();
5048
private readonly mediumImportanceExecutableTips: Map<string, IExeBasedExtensionTips> = new Map<string, IExeBasedExtensionTips>();
5149
private readonly allOtherExecutableTips: Map<string, IExeBasedExtensionTips> = new Map<string, IExeBasedExtensionTips>();

src/vs/platform/list/browser/listService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ class ListResourceNavigator<T> extends ResourceNavigator<T> {
782782

783783
class TableResourceNavigator<TRow> extends ResourceNavigator<TRow> {
784784

785-
protected override readonly widget!: Table<TRow>;
785+
protected declare readonly widget: Table<TRow>;
786786

787787
constructor(
788788
widget: Table<TRow>,
@@ -798,7 +798,7 @@ class TableResourceNavigator<TRow> extends ResourceNavigator<TRow> {
798798

799799
class TreeResourceNavigator<T, TFilterData> extends ResourceNavigator<T> {
800800

801-
protected override readonly widget!: ObjectTree<T, TFilterData> | CompressibleObjectTree<T, TFilterData> | DataTree<any, T, TFilterData> | AsyncDataTree<any, T, TFilterData> | CompressibleAsyncDataTree<any, T, TFilterData>;
801+
protected declare readonly widget: ObjectTree<T, TFilterData> | CompressibleObjectTree<T, TFilterData> | DataTree<any, T, TFilterData> | AsyncDataTree<any, T, TFilterData> | CompressibleAsyncDataTree<any, T, TFilterData>;
802802

803803
constructor(
804804
widget: ObjectTree<T, TFilterData> | CompressibleObjectTree<T, TFilterData> | DataTree<any, T, TFilterData> | AsyncDataTree<any, T, TFilterData> | CompressibleAsyncDataTree<any, T, TFilterData>,

src/vs/workbench/browser/web.main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export class BrowserMain extends Disposable {
197197
}
198198

199199
return new class extends DisposableTunnel implements ITunnel {
200-
override localAddress!: string;
200+
declare localAddress: string;
201201
}({ port: tunnel.tunnelRemotePort, host: tunnel.tunnelRemoteHost }, tunnel.localAddress, () => tunnel.dispose());
202202
}
203203
},

src/vs/workbench/contrib/tasks/common/tasks.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ export abstract class CommonTask {
701701
*/
702702
export class CustomTask extends CommonTask {
703703

704-
override type!: '$customized'; // CUSTOMIZED_TASK_TYPE
704+
declare type: '$customized'; // CUSTOMIZED_TASK_TYPE
705705

706706
instance: number | undefined;
707707

@@ -903,7 +903,7 @@ export class ContributedTask extends CommonTask {
903903
* Indicated the source of the task (e.g. tasks.json or extension)
904904
* Set in the super constructor
905905
*/
906-
override _source!: IExtensionTaskSource;
906+
declare _source: IExtensionTaskSource;
907907

908908
instance: number | undefined;
909909

@@ -997,7 +997,7 @@ export class InMemoryTask extends CommonTask {
997997

998998
instance: number | undefined;
999999

1000-
override type!: 'inMemory';
1000+
declare type: 'inMemory';
10011001

10021002
public constructor(id: string, source: IInMemoryTaskSource, label: string, type: string,
10031003
runOptions: IRunOptions, configurationProperties: IConfigurationProperties) {

src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import { Schemas } from 'vs/base/common/network';
1717

1818
class NativeExtensionTipsService extends ExtensionTipsService implements IExtensionTipsService {
1919

20-
override _serviceBrand: any;
21-
2220
private readonly channel: IChannel;
2321

2422
constructor(

0 commit comments

Comments
 (0)