Add support for ${workspaceFolderBasename} (#1044)

microsoft · Feb 4, 2020 · e371089 · e371089
1 parent 4f7dae9
commit e371089
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/src/drivers/driver.ts b/src/drivers/driver.ts
@@ -214,6 +214,7 @@ export abstract class CMakeDriver implements vscode.Disposable {
       workspaceFolder: ws_root,
       buildType: this.currentBuildType,
       workspaceRootFolderName: path.basename(ws_root),
+      workspaceFolderBasename: path.basename(ws_root),
       generator: this.generatorName || 'null',
       userHome: paths.userHome,
       buildKit: this._kit ? this._kit.name : '__unknownkit__',

diff --git a/src/expand.ts b/src/expand.ts
@@ -28,6 +28,7 @@ export interface RequiredExpansionContextVars {
   buildType: string;
   buildKit: string;
   workspaceRootFolderName: string;
+  workspaceFolderBasename: string;
   generator: string;
   userHome: string;
 }

diff --git a/src/paths.ts b/src/paths.ts
@@ -140,6 +140,7 @@ class Paths {
         buildType: '',
         generator: '',
         workspaceRootFolderName: path.basename(wsc.folder.uri.fsPath),
+        workspaceFolderBasename: path.basename(wsc.folder.uri.fsPath)
       },
     });
 

diff --git a/test/extension-tests/successful-build/test/variable-substitution.test.ts b/test/extension-tests/successful-build/test/variable-substitution.test.ts
@@ -116,6 +116,24 @@ suite('[Variable Substitution]', async () => {
     expect(typeof cacheEntry.value).to.eq('string', '[workspaceRootFolderName] unexpected cache entry value type');
   }).timeout(100000);
 
+  test('Check substitution for "workspaceFolderBasename"', async () => {
+    // Set fake settings
+    testEnv.config.updatePartial({configureSettings: {workspaceFolderBasename: '${workspaceFolderBasename}'}});
+
+    // Configure
+    expect(await cmt.configure()).to.be.eq(0, '[workspaceFolderBasename] configure failed');
+    expect(testEnv.projectFolder.buildDirectory.isCMakeCachePresent).to.eql(true, 'expected cache not present');
+    const cache = await CMakeCache.fromPath(await cmt.cachePath);
+
+    const cacheEntry = cache.get('workspaceFolderBasename') as api.CacheEntry;
+    expect(cacheEntry.type).to.eq(api.CacheEntryType.String, '[workspaceFolderBasename] unexpected cache entry type');
+    expect(cacheEntry.key)
+        .to.eq('workspaceFolderBasename', '[workspaceFolderBasename] unexpected cache entry key name');
+    expect(cacheEntry.as<string>())
+        .to.eq(path.basename(testEnv.projectFolder.location), '[workspaceFolderBasename] substitution incorrect');
+    expect(typeof cacheEntry.value).to.eq('string', '[workspaceFolderBasename] unexpected cache entry value type');
+  }).timeout(100000);
+
   test('Check substitution for "generator"', async () => {
     // Set fake settings
     testEnv.config.updatePartial({configureSettings: {generator: '${generator}'}});