Settings editor - fix extension category prefixes

microsoft · Jul 31, 2018 · 0001469 · 0001469
1 parent e466293
commit 0001469
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -402,17 +402,18 @@ export class SettingsDataSource implements IDataSource {
 }
 
 export function settingKeyToDisplayFormat(key: string, groupId = ''): { category: string, label: string } {
-	let label = wordifyKey(key);
-	const lastDotIdx = label.lastIndexOf('.');
+	const lastDotIdx = key.lastIndexOf('.');
 	let category = '';
 	if (lastDotIdx >= 0) {
-		category = label.substr(0, lastDotIdx);
-		label = label.substr(lastDotIdx + 1);
+		category = key.substr(0, lastDotIdx);
+		key = key.substr(lastDotIdx + 1);
 	}
 
-	groupId = wordifyKey(groupId.replace(/\//g, '.'));
+	groupId = groupId.replace(/\//g, '.');
 	category = trimCategoryForGroup(category, groupId);
+	category = wordifyKey(category);
 
+	const label = wordifyKey(key);
 	return { category, label };
 }
 

diff --git a/src/vs/workbench/parts/preferences/test/browser/settingsTree.test.ts b/src/vs/workbench/parts/preferences/test/browser/settingsTree.test.ts
@@ -47,6 +47,13 @@ suite('SettingsTree', () => {
 				label: 'Bar'
 			});
 
+		assert.deepEqual(
+			settingKeyToDisplayFormat('disableligatures.ligatures', 'disableligatures'),
+			{
+				category: '',
+				label: 'Ligatures'
+			});
+
 		assert.deepEqual(
 			settingKeyToDisplayFormat('foo.bar.etc', 'foo'),
 			{
@@ -62,14 +69,14 @@ suite('SettingsTree', () => {
 			});
 
 		assert.deepEqual(
-			settingKeyToDisplayFormat('foo.bar.etc', 'foo.bar'),
+			settingKeyToDisplayFormat('foo.bar.etc', 'foo/bar'),
 			{
 				category: '',
 				label: 'Etc'
 			});
 
 		assert.deepEqual(
-			settingKeyToDisplayFormat('foo.bar.etc', 'something.foo'),
+			settingKeyToDisplayFormat('foo.bar.etc', 'something/foo'),
 			{
 				category: 'Bar',
 				label: 'Etc'

diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -113,7 +113,7 @@ configurationExtPoint.setHandler(extensions => {
 
 		validateProperties(configuration, extension);
 
-		configuration.id = node.id || extension.description.uuid || extension.description.id;
+		configuration.id = node.id || extension.description.id || extension.description.uuid;
 		configuration.contributedByExtension = true;
 		configuration.title = configuration.title || extension.description.displayName || extension.description.id;
 		configurations.push(configuration);