Skip to content

Commit fcfe90d

Browse files
isidornisidorn
authored
Merge pull request microsoft#78190 from eamodio/feature/microsoft#68201-renamed
Renames ${qs} to ${query}
2 parents 3278324 + 716788a commit fcfe90d

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
6868
});
6969

7070
const sepRegexp = /\//g;
71-
const labelMatchingRegexp = /\$\{(scheme|authority|path|(qs)\.(.+?))\}/g;
71+
const labelMatchingRegexp = /\$\{(scheme|authority|path|(query)\.(.+?))\}/g;
7272

7373
function hasDriveLetter(path: string): boolean {
7474
return !!(isWindows && path && path[2] === ':');
@@ -228,7 +228,7 @@ export class LabelService implements ILabelService {
228228
case 'authority': return resource.authority;
229229
case 'path': return resource.path;
230230
default: {
231-
if (qsToken === 'qs') {
231+
if (qsToken === 'query') {
232232
const { query } = resource;
233233
if (query && query[0] === '{' && query[query.length - 1] === '}') {
234234
try {
@@ -276,4 +276,4 @@ export class LabelService implements ILabelService {
276276
}
277277
}
278278

279-
registerSingleton(ILabelService, LabelService, true);
279+
registerSingleton(ILabelService, LabelService, true);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ suite('URI Label', () => {
9898
assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'second');
9999
});
100100

101-
test('custom qs', function () {
101+
test('custom query', function () {
102102
labelService.registerFormatter({
103103
scheme: 'vscode',
104104
formatting: {
105-
label: 'LABEL${qs.prefix}: ${qs.path}/END',
105+
label: 'LABEL${query.prefix}: ${query.path}/END',
106106
separator: '/',
107107
tildify: true,
108108
normalizeDriveLetter: true
@@ -113,11 +113,11 @@ suite('URI Label', () => {
113113
assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'LABELprefix: path/END');
114114
});
115115

116-
test('custom qs without value', function () {
116+
test('custom query without value', function () {
117117
labelService.registerFormatter({
118118
scheme: 'vscode',
119119
formatting: {
120-
label: 'LABEL${qs.prefix}: ${qs.path}/END',
120+
label: 'LABEL${query.prefix}: ${query.path}/END',
121121
separator: '/',
122122
tildify: true,
123123
normalizeDriveLetter: true
@@ -128,11 +128,11 @@ suite('URI Label', () => {
128128
assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'LABEL: path/END');
129129
});
130130

131-
test('custom qs without query json', function () {
131+
test('custom query without query json', function () {
132132
labelService.registerFormatter({
133133
scheme: 'vscode',
134134
formatting: {
135-
label: 'LABEL${qs.prefix}: ${qs.path}/END',
135+
label: 'LABEL${query.prefix}: ${query.path}/END',
136136
separator: '/',
137137
tildify: true,
138138
normalizeDriveLetter: true
@@ -143,11 +143,11 @@ suite('URI Label', () => {
143143
assert.equal(labelService.getUriLabel(uri1, { relative: false }), 'LABEL: /END');
144144
});
145145

146-
test('custom qs without query', function () {
146+
test('custom query without query', function () {
147147
labelService.registerFormatter({
148148
scheme: 'vscode',
149149
formatting: {
150-
label: 'LABEL${qs.prefix}: ${qs.path}/END',
150+
label: 'LABEL${query.prefix}: ${query.path}/END',
151151
separator: '/',
152152
tildify: true,
153153
normalizeDriveLetter: true

0 commit comments

Comments
 (0)