maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Trim categories for more cases

Browse source 
Fixes https://github.com/microsoft/vscode/issues/135433
This commit is contained in:
Raymond Zhao 2021-11-24 11:25:33 -08:00
parent 57ca9b99d5
commit 483d6f15ed
No known key found for this signature in database
GPG key ID: D36E5FCE46B63B58
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
View file

@ -151,7 +151,7 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
get displayCategory(): string {
if (!this._displayCategory) {
this.initLabel();
this.initLabels();
}
return this._displayCategory!;
@ -159,13 +159,13 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
get displayLabel(): string {
if (!this._displayLabel) {
this.initLabel();
this.initLabels();
}
return this._displayLabel!;
}
private initLabel(): void {
private initLabels(): void {
const displayKeyFormat = settingKeyToDisplayFormat(this.setting.key, this.parent!.id);
this._displayLabel = displayKeyFormat.label;
this._displayCategory = displayKeyFormat.category;
@ -537,9 +537,29 @@ function wordifyKey(key: string): string {
return key;
}
/**
* Removes redundant sections of the category label.
* A redundant section is a section already reflected in the groupId.
*
* @param category The category of the specific setting.
* @param groupId The author + extension ID.
* @returns The new category label to use.
*/
function trimCategoryForGroup(category: string, groupId: string): string {
const doTrim = (forward: boolean) => {
const parts = groupId.split('.');
// Remove the Insiders portion if the category doesn't use it.
if (!/insiders$/i.test(category)) {
groupId = groupId.replace(/-?insiders$/i, '');
}
const parts = groupId.split('.')
.map(part => {
// Remove hyphens, but only if that results in a match with the category.
if (part.replace(/-/g, '').toLowerCase() === category.toLowerCase()) {
return part.replace(/-/g, '');
} else {
return part;
}
});
while (parts.length) {
const reg = new RegExp(`^${parts.join('\\.')}(\\.|$)`, 'i');
if (reg.test(category)) {