Fix1914 - Variable substitution stopped working with release 1.7 #3268
Conversation
…ated to sourceDirectory and kit info
…ttps://github.com/microsoft/vscode-cmake-tools into dev/andris/cmake_tools/fix1914_varexp_kit_sourceDir
src/presetsController.ts
Outdated
| @@ -42,12 +43,26 @@ export class PresetsController { | |||
| const presetsController = new PresetsController(project, kitsController, isMultiProject); | |||
| const expandSourceDir = async (dir: string) => { | |||
| const workspaceFolder = project.workspaceFolder.uri.fsPath; | |||
| const kit = project.getActiveKit(); | |||
There was a problem hiding this comment.
This part worries me, if we're in the presetsController then don't we not care about kits? Since it's either kits or Presets? Not both?
There was a problem hiding this comment.
I didn't step back and realize this obvious fact. I just noticed errors and complains in my repro and just went head first into making those go away. I'll rethink a bit and get back with an update. Very good essential point.
src/drivers/cmakeDriver.ts
Outdated
| const ws_root = util.lightNormalizePath(workspaceFolderFspath || '.'); | ||
|
|
||
| // Fill in default replacements | ||
| if (!kit) { |
There was a problem hiding this comment.
Same worry here, I'm not sure we want to be using kits every time the cmakeDriver uses this method, since couldn't a preset use this method?
There was a problem hiding this comment.
Perfect point, I'll rethink and be back with an update.
|
The last PR update does the following:
|
Fix1914 - Variable substitution stopped working with release 1.7, related to sourceDirectory and kit info variables.
#1914
Will add explanations later, do more cleanup and also ensure more variables are considered. For now, just kit name and vendor, two examples that are different and exist in different data structures. Creating the PR to see tests outcome.