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

Modify formatting of perference's name to align vscode #9381

Merged
merged 1 commit into from
Apr 28, 2021
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,37 @@ describe('preference-tree-generator', () => {

it('PreferenceTreeGenerator.format', () => {
const testString = 'aaaBbbCcc Dddd eee';
expect(preferenceTreeGenerator['formatString'](testString)).eq('Aaa Bbb Ccc Dddd Eee');
expect(preferenceTreeGenerator['formatString'](testString)).eq('Aaa Bbb Ccc Dddd eee');
});

it('PreferenceTreeGenerator.format.chinese', () => {
const testString = '某個設定/某个设定';
expect(preferenceTreeGenerator['formatString'](testString)).eq('某個設定/某个设定');
});

it('PreferenceTreeGenerator.format.Danish', () => {
const testString = 'indstillingPåEnØ';
expect(preferenceTreeGenerator['formatString'](testString)).eq('Indstilling På En Ø');
});

it('PreferenceTreeGenerator.format.Greek', () => {
const testString = 'κάποιαΡύθμιση';
expect(preferenceTreeGenerator['formatString'](testString)).eq('Κάποια Ρύθμιση');
});

it('PreferenceTreeGenerator.format.Russian', () => {
const testString = 'некоторыеНастройки';
expect(preferenceTreeGenerator['formatString'](testString)).eq('Некоторые Настройки');
});

it('PreferenceTreeGenerator.format.Armenian', () => {
const testString = 'ինչ-որՊարամետր';
expect(preferenceTreeGenerator['formatString'](testString)).eq('Ինչ-որ Պարամետր');
});

it('PreferenceTreeGenerator.format.specialCharacters', () => {
const testString = 'hyphenated-wordC++Setting';
expect(preferenceTreeGenerator['formatString'](testString)).eq('Hyphenated-word C++ Setting');
});

describe('PreferenceTreeGenerator.createLeafNode', () => {
Expand Down
18 changes: 14 additions & 4 deletions packages/preferences/src/browser/util/preference-tree-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class PreferenceTreeGenerator {
const label = isSubgroup ? subgroupname : groupname;
const newNode = {
id: group,
name: this.toTitleCase(label),
name: this.formatString(label),
visible: true,
parent: root,
children: [],
Expand Down Expand Up @@ -136,8 +136,18 @@ export class PreferenceTreeGenerator {
return split;
}

private formatString(string: string): string {
const specifier = this.split(string);
return specifier.map(word => word.slice(0, 1).toLocaleUpperCase() + word.slice(1)).join(' ').trim();
protected formatString(string: string): string {
let formatedString = string[0].toLocaleUpperCase();
for (let i = 1; i < string.length; i++) {
if (this.isUpperCase(string[i]) && !/\s/.test(string[i - 1]) && !this.isUpperCase(string[i - 1])) {
formatedString += ' ';
}
formatedString += string[i];
}
return formatedString.trim();
}

protected isUpperCase(char: string): boolean {
return char === char.toLocaleUpperCase() && char.toLocaleLowerCase() !== char.toLocaleUpperCase();
}
}