From 62d4b783965fcabc431c786146917593a2772b3d Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Mon, 26 Sep 2016 21:16:50 +0200 Subject: [PATCH] Merged in PR #11128 --- .../node/configurationResolverService.ts | 4 ++++ .../test/node/configurationResolverService.test.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts index 37dc6f13691..51cb1b5e265 100644 --- a/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts @@ -49,6 +49,10 @@ export class ConfigurationResolverService implements IConfigurationResolverServi return this._workspaceRoot; } + private get workspaceRootFolderName(): string { + return this.workspaceRoot ? paths.basename(this.workspaceRoot) : ''; + } + private get file(): string { return this.getFilePath(); } diff --git a/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts index 303528bf732..c6a9d539975 100644 --- a/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts @@ -36,6 +36,10 @@ suite('Configuration Resolver Service', () => { } }); + test('workspace root folder name', () => { + assert.strictEqual(configurationResolverService.resolve('abc ${workspaceRootFolderName} xyz'), 'abc workspaceLocation xyz'); + }); + test('substitute many', () => { if (platform.isWindows) { assert.strictEqual(configurationResolverService.resolve('${workspaceRoot} - ${workspaceRoot}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation'); -- GitLab