Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Bug Fixes:
- Fix issue where CMakeTools does not recheck CMake Path to see if user installed CMake after launching VS Code. [3811](https://github.com/microsoft/vscode-cmake-tools/issues/3811)
- Fix issue where `cmake.buildToolArgs` was sometimes applied incorrectly when presets are used [#3754](https://github.com/microsoft/vscode-cmake-tools/issues/3754)
- Still allow for users to add `--warn-unused-cli`. Now instead of overriding, it will remove our default `--no-warn-unused-cli`. [#1090](https://github.com/microsoft/vscode-cmake-tools/issues/1090)
- Ensure `useCMakePresets` context is set after making a CMakePreset.json with `Quick Start`. [#3734](https://github.com/microsoft/vscode-cmake-tools/issues/3734)

## 1.18.42

Expand Down
4 changes: 4 additions & 0 deletions src/cmakeProject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ export class CMakeProject {
private onDidOpenTextDocumentListener: vscode.Disposable | undefined;
private disposables: vscode.Disposable[] = [];
private readonly onUseCMakePresetsChangedEmitter = new vscode.EventEmitter<boolean>();
private projectController: ProjectController | undefined;
public readonly cTestController: CTestDriver;
public readonly cPackageController: CPackDriver;
public readonly workflowController: WorkflowDriver;
Expand All @@ -154,6 +155,7 @@ export class CMakeProject {
private constructor(readonly workspaceContext: DirectoryContext, projectController?: ProjectController, readonly isMultiProjectFolder: boolean = false) {
// Handle the active kit changing. We want to do some updates and teardown
log.debug(localize('constructing.cmakeproject', 'Constructing new CMakeProject instance'));
this.projectController = projectController;
this.cTestController = new CTestDriver(workspaceContext, projectController);
this.cPackageController = new CPackDriver(workspaceContext);
this.workflowController = new WorkflowDriver(workspaceContext, projectController);
Expand Down Expand Up @@ -2853,6 +2855,8 @@ export class CMakeProject {
}
}

await this.projectController?.updateActiveProject(this.workspaceFolder);

// Regardless of the following configure return code,
// we want full feature set view for the whole workspace.
await enableFullFeatureSet(true);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I noticed while testing is that line 2863 (in the new version), will technically force a second configure if the automaticReconfigure setting is enabled. I don't think this needs to block this PR, but it is something we should look into.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will make a note to look into it in a follow up task

Expand Down