Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-02 23:05:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Settings editor 💄 remove setting "index"

Browse Source
This commit is contained in:
Rob Lourens
2020-09-28 10:26:33 -07:00
parent 4eea30beaa
commit 97ff28275b
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+10 -27
View File
@@ -30,14 +30,8 @@ export abstract class SettingsTreeElement {
id: string;
parent?: SettingsTreeGroupElement;
/**
* Index assigned in display order, used for paging.
*/
index: number;
constructor(_id: string, _index: number) {
constructor(_id: string) {
this.id = _id;
this.index = _index;
}
}
@@ -67,8 +61,8 @@ export class SettingsTreeGroupElement extends SettingsTreeElement {
});
}
constructor(_id: string, _index: number, count: number | undefined, label: string, level: number, isFirstGroup: boolean) {
super(_id, _index);
constructor(_id: string, count: number | undefined, label: string, level: number, isFirstGroup: boolean) {
super(_id);
this.count = count;
this.label = label;
@@ -85,8 +79,8 @@ export class SettingsTreeGroupElement extends SettingsTreeElement {
}
export class SettingsTreeNewExtensionsElement extends SettingsTreeElement {
constructor(_id: string, _index: number, public readonly extensionIds: string[]) {
super(_id, _index);
constructor(_id: string, public readonly extensionIds: string[]) {
super(_id);
}
}
@@ -123,8 +117,8 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
description!: string;
valueType!: SettingValueType;
constructor(setting: ISetting, parent: SettingsTreeGroupElement, index: number, inspectResult: IInspectResult) {
super(sanitizeId(parent.id + '_' + setting.key), index);
constructor(setting: ISetting, parent: SettingsTreeGroupElement, inspectResult: IInspectResult) {
super(sanitizeId(parent.id + '_' + setting.key));
this.setting = setting;
this.parent = parent;
@@ -282,7 +276,6 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
export class SettingsTreeModel {
protected _root!: SettingsTreeGroupElement;
protected _treeElementsById = new Map<string, SettingsTreeElement>();
private _treeElementsBySettingName = new Map<string, SettingsTreeSettingElement[]>();
private _tocRoot!: ITOCEntry;
@@ -296,7 +289,6 @@ export class SettingsTreeModel {
}
update(newTocRoot = this._tocRoot): void {
this._treeElementsById.clear();
this._treeElementsBySettingName.clear();
const newRoot = this.createSettingsTreeGroupElement(newTocRoot);
@@ -311,10 +303,6 @@ export class SettingsTreeModel {
}
}
getElementById(id: string): SettingsTreeElement | null {
return withUndefinedAsNull(this._treeElementsById.get(id));
}
getElementsByName(name: string): SettingsTreeSettingElement[] | null {
return withUndefinedAsNull(this._treeElementsBySettingName.get(name));
}
@@ -332,9 +320,8 @@ export class SettingsTreeModel {
private createSettingsTreeGroupElement(tocEntry: ITOCEntry, parent?: SettingsTreeGroupElement): SettingsTreeGroupElement {
const index = this._treeElementsById.size;
const depth = parent ? this.getDepth(parent) + 1 : 0;
const element = new SettingsTreeGroupElement(tocEntry.id, index, undefined, tocEntry.label, depth, false);
const element = new SettingsTreeGroupElement(tocEntry.id, undefined, tocEntry.label, depth, false);
const children: SettingsTreeGroupChild[] = [];
if (tocEntry.settings) {
@@ -350,7 +337,6 @@ export class SettingsTreeModel {
element.children = children;
this._treeElementsById.set(element.id, element);
return element;
}
@@ -363,10 +349,8 @@ export class SettingsTreeModel {
}
private createSettingsTreeSettingElement(setting: ISetting, parent: SettingsTreeGroupElement): SettingsTreeSettingElement {
const index = this._treeElementsById.size;
const inspectResult = inspectSetting(setting.key, this._viewState.settingsTarget, this._configurationService);
const element = new SettingsTreeSettingElement(setting, parent, index, inspectResult);
this._treeElementsById.set(element.id, element);
const element = new SettingsTreeSettingElement(setting, parent, inspectResult);
const nameElements = this._treeElementsBySettingName.get(setting.key) || [];
nameElements.push(element);
@@ -602,9 +586,8 @@ export class SearchResultModel extends SettingsTreeModel {
.filter(setting => setting.extensionName && setting.extensionPublisher)
.map(setting => `${setting.extensionPublisher}.${setting.extensionName}`);
const newExtElement = new SettingsTreeNewExtensionsElement('newExtensions', this._treeElementsById.size, arrays.distinct(resultExtensionIds));
const newExtElement = new SettingsTreeNewExtensionsElement('newExtensions', arrays.distinct(resultExtensionIds));
newExtElement.parent = this._root;
this._treeElementsById.set(newExtElement.id, newExtElement);
this._root.children.push(newExtElement);
}
}