Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support different debug config for different launch targets #2801

Merged
merged 7 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from 5 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 @@ -11,6 +11,7 @@ Improvements:
- Add a public API for extension authors that depend on CMake Tools. [#494](https://github.com/microsoft/vscode-cmake-tools/issues/494)
- Support explicit typing in `cmake.configureSettings`. [#1457](https://github.com/microsoft/vscode-cmake-tools/issues/1457)
- Scan for kits will now add ARM64 hosts for MSVC. [PR #2887](https://github.com/microsoft/vscode-cmake-tools/pull/2887) [@scaryrawr](https://github.com/scaryrawr)
- Support different debug config for different targets. [PR #2801](https://github.com/microsoft/vscode-cmake-tools/pull/2801) [@RichardLuo0](https://github.com/RichardLuo0)

Bug Fixes:
- Fix warning message that appears when using a default build preset with a multi-config generator. [#2353](https://github.com/microsoft/vscode-cmake-tools/issues/2353)
Expand Down
54 changes: 42 additions & 12 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1252,34 +1252,64 @@ export class ExtensionManager implements vscode.Disposable {
return this.runCMakeCommandForProject(cmakeProject => cmakeProject.quickStart(folder));
}

launchTargetPath(folder?: vscode.WorkspaceFolder | string) {
launchTargetPath({ folder, targetName }: { folder?: vscode.WorkspaceFolder | string; targetName?: string }) {
telemetry.logEvent("substitution", { command: "launchTargetPath" });
return this.queryCMakeProject(cmakeProject => cmakeProject.launchTargetPath(), folder);
return this.queryCMakeProject(async cmakeProject => {
if (targetName !== null) {
gcampbell-msft marked this conversation as resolved.
Show resolved Hide resolved
await cmakeProject.setLaunchTargetByName(targetName);
}
return cmakeProject.launchTargetPath();
}, folder);
}

launchTargetDirectory(folder?: vscode.WorkspaceFolder | string) {
launchTargetDirectory({ folder, targetName }: { folder?: vscode.WorkspaceFolder | string; targetName?: string }) {
telemetry.logEvent("substitution", { command: "launchTargetDirectory" });
return this.queryCMakeProject(cmakeProject => cmakeProject.launchTargetDirectory(), folder);
return this.queryCMakeProject(async cmakeProject => {
if (targetName !== null) {
await cmakeProject.setLaunchTargetByName(targetName);
}
return cmakeProject.launchTargetDirectory();
}, folder);
}

launchTargetFilename(folder?: vscode.WorkspaceFolder | string) {
launchTargetFilename({ folder, targetName }: { folder?: vscode.WorkspaceFolder | string; targetName?: string }) {
telemetry.logEvent("substitution", { command: "launchTargetFilename" });
return this.queryCMakeProject(cmakeProject => cmakeProject.launchTargetFilename(), folder);
return this.queryCMakeProject(async cmakeProject => {
if (targetName !== null) {
await cmakeProject.setLaunchTargetByName(targetName);
}
return cmakeProject.launchTargetFilename();
}, folder);
}

getLaunchTargetPath(folder?: vscode.WorkspaceFolder | string) {
getLaunchTargetPath({ folder, targetName }: { folder?: vscode.WorkspaceFolder | string; targetName?: string }) {
telemetry.logEvent("substitution", { command: "getLaunchTargetPath" });
return this.queryCMakeProject(cmakeProject => cmakeProject.getLaunchTargetPath(), folder);
return this.queryCMakeProject(async cmakeProject => {
if (targetName !== null) {
await cmakeProject.setLaunchTargetByName(targetName);
}
return cmakeProject.getLaunchTargetPath();
}, folder);
}

getLaunchTargetDirectory(folder?: vscode.WorkspaceFolder | string) {
getLaunchTargetDirectory({ folder, targetName }: { folder?: vscode.WorkspaceFolder | string; targetName?: string }) {
telemetry.logEvent("substitution", { command: "getLaunchTargetDirectory" });
return this.queryCMakeProject(cmakeProject => cmakeProject.getLaunchTargetDirectory(), folder);
return this.queryCMakeProject(async cmakeProject => {
if (targetName !== null) {
await cmakeProject.setLaunchTargetByName(targetName);
}
return cmakeProject.getLaunchTargetDirectory();
}, folder);
}

getLaunchTargetFilename(folder?: vscode.WorkspaceFolder | string) {
getLaunchTargetFilename({ folder, targetName }: { folder?: vscode.WorkspaceFolder | string; targetName?: string }) {
telemetry.logEvent("substitution", { command: "getLaunchTargetFilename" });
return this.queryCMakeProject(cmakeProject => cmakeProject.getLaunchTargetFilename(), folder);
return this.queryCMakeProject(async cmakeProject => {
if (targetName !== null) {
await cmakeProject.setLaunchTargetByName(targetName);
}
return cmakeProject.getLaunchTargetFilename();
}, folder);
}

buildTargetName(folder?: vscode.WorkspaceFolder | string) {
Expand Down