Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce usage of invalid property overrides #165293

Merged
merged 1 commit into from Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/tree/asyncDataTree.ts
Expand Up @@ -1150,7 +1150,7 @@ export interface ICompressibleAsyncDataTreeOptionsUpdate extends IAsyncDataTreeO

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/tree/dataTree.ts
Expand Up @@ -16,7 +16,7 @@ export interface IDataTreeOptions<T, TFilterData = void> extends IAbstractTreeOp

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

protected override model!: ObjectTreeModel<T, TFilterData>;
protected declare model: ObjectTreeModel<T, TFilterData>;
private input: TInput | undefined;

private identityProvider: IIdentityProvider<T> | undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/tree/indexTree.ts
Expand Up @@ -14,7 +14,7 @@ export interface IIndexTreeOptions<T, TFilterData = void> extends IAbstractTreeO

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

protected override model!: IndexTreeModel<T, TFilterData>;
protected declare model: IndexTreeModel<T, TFilterData>;

constructor(
user: string,
Expand Down
4 changes: 2 additions & 2 deletions src/vs/base/browser/ui/tree/objectTree.ts
Expand Up @@ -45,7 +45,7 @@ export interface IObjectTreeViewState {

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

protected override model!: IObjectTreeModel<T, TFilterData>;
protected declare model: IObjectTreeModel<T, TFilterData>;

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

Expand Down Expand Up @@ -197,7 +197,7 @@ export interface ICompressibleObjectTreeOptionsUpdate extends IAbstractTreeOptio

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

protected override model!: CompressibleObjectTreeModel<T, TFilterData>;
protected declare model: CompressibleObjectTreeModel<T, TFilterData>;

constructor(
user: string,
Expand Down
Expand Up @@ -44,8 +44,6 @@ const lastPromptedMediumImpExeTimeStorageKey = 'extensionTips/lastPromptedMedium

export class ExtensionTipsService extends BaseExtensionTipsService {

override _serviceBrand: any;

private readonly highImportanceExecutableTips: Map<string, IExeBasedExtensionTips> = new Map<string, IExeBasedExtensionTips>();
private readonly mediumImportanceExecutableTips: Map<string, IExeBasedExtensionTips> = new Map<string, IExeBasedExtensionTips>();
private readonly allOtherExecutableTips: Map<string, IExeBasedExtensionTips> = new Map<string, IExeBasedExtensionTips>();
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/list/browser/listService.ts
Expand Up @@ -782,7 +782,7 @@ class ListResourceNavigator<T> extends ResourceNavigator<T> {

class TableResourceNavigator<TRow> extends ResourceNavigator<TRow> {

protected override readonly widget!: Table<TRow>;
protected declare readonly widget: Table<TRow>;

constructor(
widget: Table<TRow>,
Expand All @@ -798,7 +798,7 @@ class TableResourceNavigator<TRow> extends ResourceNavigator<TRow> {

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

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

constructor(
widget: ObjectTree<T, TFilterData> | CompressibleObjectTree<T, TFilterData> | DataTree<any, T, TFilterData> | AsyncDataTree<any, T, TFilterData> | CompressibleAsyncDataTree<any, T, TFilterData>,
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/web.main.ts
Expand Up @@ -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());
}
},
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/tasks/common/tasks.ts
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
Expand Up @@ -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(
Expand Down