Merge pull request #78190 from eamodio/feature/#68201-renamed

Renames ${qs} to ${query}

src/vs/workbench/services/label/common/labelService.ts

@@ -68,7 +68,7 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
 });
 
 const sepRegexp = /\//g;
-const labelMatchingRegexp = /\$\{(scheme|authority|path|(qs)\.(.+?))\}/g;
+const labelMatchingRegexp = /\$\{(scheme|authority|path|(query)\.(.+?))\}/g;
 
 function hasDriveLetter(path: string): boolean {
 	return !!(isWindows && path && path[2] === ':');
@@ -228,7 +228,7 @@ export class LabelService implements ILabelService {
 				case 'authority': return resource.authority;
 				case 'path': return resource.path;
 				default: {
-					if (qsToken === 'qs') {
+					if (qsToken === 'query') {
 						const { query } = resource;
 						if (query && query[0] === '{' && query[query.length - 1] === '}') {
 							try {
@@ -276,4 +276,4 @@ export class LabelService implements ILabelService {
 	}
 }
 
-registerSingleton(ILabelService, LabelService, true);
\ No newline at end of file
+registerSingleton(ILabelService, LabelService, true);

src/vs/workbench/services/label/test/label.test.ts

@@ -98,11 +98,11 @@ suite('URI Label', () => {
 		assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'second');
 	});
 
-	test('custom qs', function () {
+	test('custom query', function () {
 		labelService.registerFormatter({
 			scheme: 'vscode',
 			formatting: {
-				label: 'LABEL${qs.prefix}: ${qs.path}/END',
+				label: 'LABEL${query.prefix}: ${query.path}/END',
 				separator: '/',
 				tildify: true,
 				normalizeDriveLetter: true
@@ -113,11 +113,11 @@ suite('URI Label', () => {
 		assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'LABELprefix: path/END');
 	});
 
-	test('custom qs without value', function () {
+	test('custom query without value', function () {
 		labelService.registerFormatter({
 			scheme: 'vscode',
 			formatting: {
-				label: 'LABEL${qs.prefix}: ${qs.path}/END',
+				label: 'LABEL${query.prefix}: ${query.path}/END',
 				separator: '/',
 				tildify: true,
 				normalizeDriveLetter: true
@@ -128,11 +128,11 @@ suite('URI Label', () => {
 		assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'LABEL: path/END');
 	});
 
-	test('custom qs without query json', function () {
+	test('custom query without query json', function () {
 		labelService.registerFormatter({
 			scheme: 'vscode',
 			formatting: {
-				label: 'LABEL${qs.prefix}: ${qs.path}/END',
+				label: 'LABEL${query.prefix}: ${query.path}/END',
 				separator: '/',
 				tildify: true,
 				normalizeDriveLetter: true
@@ -143,11 +143,11 @@ suite('URI Label', () => {
 		assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'LABEL: /END');
 	});
 
-	test('custom qs without query', function () {
+	test('custom query without query', function () {
 		labelService.registerFormatter({
 			scheme: 'vscode',
 			formatting: {
-				label: 'LABEL${qs.prefix}: ${qs.path}/END',
+				label: 'LABEL${query.prefix}: ${query.path}/END',
 				separator: '/',
 				tildify: true,
 				normalizeDriveLetter: true