Don't ask for test preset if it's not set when refreshing test explorer (#3207)
* Need to reset preset info in driver when updating configure preset * Fix test explorer refresh after preset changes * Resolve comments * Fix typo --------- Co-authored-by: Ben McMorran <bemcmorr@microsoft.com>
This commit is contained in:
xisui-MSFT
GitHub
Родитель
86c8c5e350
Коммит
45cafe363a
|
|
@ -2652,5 +2652,6 @@
|
|||
},
|
||||
"extensionPack": [
|
||||
"twxs.cmake"
|
||||
]
|
||||
],
|
||||
"packageManager": "yarn@1.22.19"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,8 +128,8 @@ export class CMakeProject {
|
|||
private wasUsingCMakePresets: boolean | undefined;
|
||||
private onDidOpenTextDocumentListener: vscode.Disposable | undefined;
|
||||
private disposables: vscode.Disposable[] = [];
|
||||
private readonly cTestController: CTestDriver;
|
||||
private readonly onUseCMakePresetsChangedEmitter = new vscode.EventEmitter<boolean>();
|
||||
public readonly cTestController: CTestDriver;
|
||||
public kitsController!: KitsController;
|
||||
public presetsController!: PresetsController;
|
||||
|
||||
|
|
@ -226,7 +226,7 @@ export class CMakeProject {
|
|||
}
|
||||
private readonly _configurePreset = new Property<preset.ConfigurePreset | null>(null);
|
||||
|
||||
private async resetPresets() {
|
||||
private async resetPresets(driver: CMakeDriver | null) {
|
||||
await this.workspaceContext.state.setConfigurePresetName(this.folderName, null, this.isMultiProjectFolder);
|
||||
if (this.configurePreset) {
|
||||
await this.workspaceContext.state.setBuildPresetName(this.folderName, this.configurePreset.name, null, this.isMultiProjectFolder);
|
||||
|
|
@ -235,6 +235,9 @@ export class CMakeProject {
|
|||
this._configurePreset.set(null);
|
||||
this._buildPreset.set(null);
|
||||
this._testPreset.set(null);
|
||||
await driver?.setConfigurePreset(null);
|
||||
await driver?.setBuildPreset(null);
|
||||
await driver?.setTestPreset(null);
|
||||
}
|
||||
|
||||
async expandConfigPresetbyName(configurePreset: string | null | undefined): Promise<preset.ConfigurePreset | undefined> {
|
||||
|
|
@ -270,11 +273,12 @@ export class CMakeProject {
|
|||
*/
|
||||
async setConfigurePreset(configurePreset: string | null) {
|
||||
const previousGenerator = this.configurePreset?.generator;
|
||||
const drv = await this.cmakeDriver; // Use only an existing driver, do not create one
|
||||
|
||||
if (configurePreset) {
|
||||
const expandedConfigurePreset: preset.ConfigurePreset | undefined = await this.expandConfigPresetbyName(configurePreset);
|
||||
if (!expandedConfigurePreset) {
|
||||
await this.resetPresets();
|
||||
await this.resetPresets(drv);
|
||||
return;
|
||||
}
|
||||
this._configurePreset.set(expandedConfigurePreset);
|
||||
|
|
@ -282,7 +286,6 @@ export class CMakeProject {
|
|||
await this.shutDownCMakeDriver();
|
||||
}
|
||||
log.debug(localize('loading.new.config.preset', 'Loading new configure preset into CMake driver'));
|
||||
const drv = await this.cmakeDriver; // Use only an existing driver, do not create one
|
||||
if (drv) {
|
||||
try {
|
||||
this.statusMessage.set(localize('reloading.status', 'Reloading...'));
|
||||
|
|
@ -293,14 +296,14 @@ export class CMakeProject {
|
|||
void vscode.window.showErrorMessage(localize('unable.to.set.config.preset', 'Unable to set configure preset {0}.', `"${error}"`));
|
||||
this.statusMessage.set(localize('error.on.switch.config.preset', 'Error on switch of configure preset ({0})', error.message));
|
||||
this.cmakeDriver = Promise.resolve(null);
|
||||
await this.resetPresets();
|
||||
await this.resetPresets(drv);
|
||||
}
|
||||
} else {
|
||||
// Remember the selected configure preset for the next session.
|
||||
await this.workspaceContext.state.setConfigurePresetName(this.folderName, configurePreset, this.isMultiProjectFolder);
|
||||
}
|
||||
} else {
|
||||
await this.resetPresets();
|
||||
await this.resetPresets(drv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -339,6 +342,7 @@ export class CMakeProject {
|
|||
* Presets are loaded by PresetsController, so this function should only be called by PresetsController.
|
||||
*/
|
||||
async setBuildPreset(buildPreset: string | null) {
|
||||
const drv = await this.cmakeDriver; // Use only an existing driver, do not create one
|
||||
if (buildPreset) {
|
||||
const expandedBuildPreset = await this.expandBuildPresetbyName(buildPreset);
|
||||
if (!expandedBuildPreset) {
|
||||
|
|
@ -352,7 +356,6 @@ export class CMakeProject {
|
|||
return;
|
||||
}
|
||||
log.debug(localize('loading.new.build.preset', 'Loading new build preset into CMake driver'));
|
||||
const drv = await this.cmakeDriver; // Use only an existing driver, do not create one
|
||||
if (drv) {
|
||||
try {
|
||||
this.statusMessage.set(localize('reloading.status', 'Reloading...'));
|
||||
|
|
@ -371,6 +374,7 @@ export class CMakeProject {
|
|||
}
|
||||
} else {
|
||||
this._buildPreset.set(null);
|
||||
await drv?.setBuildPreset(null);
|
||||
if (this.configurePreset) {
|
||||
await this.workspaceContext.state.setBuildPresetName(this.folderName, this.configurePreset.name, null, this.isMultiProjectFolder);
|
||||
}
|
||||
|
|
@ -415,6 +419,7 @@ export class CMakeProject {
|
|||
* Presets are loaded by PresetsController, so this function should only be called by PresetsController.
|
||||
*/
|
||||
async setTestPreset(testPreset: string | null) {
|
||||
const drv = await this.cmakeDriver; // Use only an existing driver, do not create one
|
||||
if (testPreset) {
|
||||
log.debug(localize('resolving.test.preset', 'Resolving the selected test preset'));
|
||||
const expandedTestPreset = await this.expandTestPresetbyName(testPreset);
|
||||
|
|
@ -424,7 +429,6 @@ export class CMakeProject {
|
|||
}
|
||||
this._testPreset.set(expandedTestPreset);
|
||||
log.debug(localize('loading.new.test.preset', 'Loading new test preset into CMake driver'));
|
||||
const drv = await this.cmakeDriver; // Use only an existing driver, do not create one
|
||||
if (drv) {
|
||||
try {
|
||||
this.statusMessage.set(localize('reloading.status', 'Reloading...'));
|
||||
|
|
@ -447,6 +451,7 @@ export class CMakeProject {
|
|||
}
|
||||
} else {
|
||||
this._testPreset.set(null);
|
||||
await drv?.setTestPreset(null);
|
||||
if (this.configurePreset) {
|
||||
await this.workspaceContext.state.setTestPresetName(this.folderName, this.configurePreset.name, null, this.isMultiProjectFolder);
|
||||
}
|
||||
|
|
@ -1286,7 +1291,7 @@ export class CMakeProject {
|
|||
if (result === 0) {
|
||||
await this.refreshCompileDatabase(drv.expansionOptions);
|
||||
}
|
||||
await this.cTestController.refreshTests(drv, this.useCMakePresets);
|
||||
await this.cTestController.refreshTests(drv);
|
||||
this.onReconfiguredEmitter.fire();
|
||||
return result;
|
||||
}
|
||||
|
|
@ -1386,7 +1391,7 @@ export class CMakeProject {
|
|||
});
|
||||
}
|
||||
|
||||
await this.cTestController.refreshTests(drv, this.useCMakePresets);
|
||||
await this.cTestController.refreshTests(drv);
|
||||
this.onReconfiguredEmitter.fire();
|
||||
return result;
|
||||
} finally {
|
||||
|
|
@ -1883,7 +1888,7 @@ export class CMakeProject {
|
|||
}
|
||||
|
||||
public async runCTestCustomized(driver: CMakeDriver, testPreset?: preset.TestPreset, consumer?: proc.OutputConsumer) {
|
||||
return this.cTestController.runCTest(driver, this.useCMakePresets, true, testPreset, consumer);
|
||||
return this.cTestController.runCTest(driver, true, testPreset, consumer);
|
||||
}
|
||||
|
||||
private async preTest(): Promise<CMakeDriver> {
|
||||
|
|
@ -1901,7 +1906,7 @@ export class CMakeProject {
|
|||
|
||||
async ctest(): Promise<number> {
|
||||
const drv = await this.preTest();
|
||||
return (await this.cTestController.runCTest(drv, this.useCMakePresets)) ? 0 : -1;
|
||||
return (await this.cTestController.runCTest(drv)) ? 0 : -1;
|
||||
}
|
||||
|
||||
async revealTestExplorer() {
|
||||
|
|
@ -1913,7 +1918,7 @@ export class CMakeProject {
|
|||
|
||||
async refreshTests(): Promise<number> {
|
||||
const drv = await this.preTest();
|
||||
return this.cTestController.refreshTests(drv, this.useCMakePresets);
|
||||
return this.cTestController.refreshTests(drv);
|
||||
}
|
||||
|
||||
addTestExplorerRoot(folder: string) {
|
||||
|
|
|
|||
85
src/ctest.ts
85
src/ctest.ts
|
|
@ -24,6 +24,9 @@ const magicKey = 'ctest.magic.key';
|
|||
// Used as magic value
|
||||
let sessionNum= 0;
|
||||
|
||||
// Placeholder in the test explorer when test preset is not selected
|
||||
const testPresetRequired = '_test_preset_required_';
|
||||
|
||||
interface SiteAttributes {}
|
||||
|
||||
type TestStatus = ('failed' | 'notrun' | 'passed');
|
||||
|
|
@ -241,14 +244,11 @@ export class CTestDriver implements vscode.Disposable {
|
|||
return items;
|
||||
};
|
||||
|
||||
private async getCTestArgs(driver: CMakeDriver, useCMakePresets: boolean, customizedTask: boolean = false, testPreset?: TestPreset): Promise<string[] | undefined> {
|
||||
private async getCTestArgs(driver: CMakeDriver, customizedTask: boolean = false, testPreset?: TestPreset): Promise<string[] | undefined> {
|
||||
let ctestArgs: string[];
|
||||
if (customizedTask && testPreset) {
|
||||
ctestArgs = ['-T', 'test'].concat(testArgs(testPreset));
|
||||
} else if (!customizedTask && useCMakePresets) {
|
||||
if (!driver.testPreset) {
|
||||
await vscode.commands.executeCommand('cmake.selectTestPreset', (await this.projectController?.getProjectForFolder(driver.workspaceFolder))?.workspaceFolder);
|
||||
}
|
||||
} else if (!customizedTask && driver.useCMakePresets) {
|
||||
if (!driver.testPreset) {
|
||||
// Test explorer doesn't handle errors well, so we need to deal with them ourselves
|
||||
return undefined;
|
||||
|
|
@ -272,15 +272,14 @@ export class CTestDriver implements vscode.Disposable {
|
|||
return ctestArgs;
|
||||
}
|
||||
|
||||
// The drv.useCMakePresets may not be updated here yet, so we need to pass it in.
|
||||
public async runCTest(driver: CMakeDriver, useCMakePresets: boolean, customizedTask: boolean = false, testPreset?: TestPreset, consumer?: proc.OutputConsumer): Promise<number> {
|
||||
public async runCTest(driver: CMakeDriver, customizedTask: boolean = false, testPreset?: TestPreset, consumer?: proc.OutputConsumer): Promise<number> {
|
||||
if (!customizedTask) {
|
||||
// We don't want to focus on log channel when running tasks.
|
||||
log.showChannel();
|
||||
}
|
||||
|
||||
if (!testExplorer) {
|
||||
await this.refreshTests(driver, useCMakePresets);
|
||||
await this.refreshTests(driver);
|
||||
}
|
||||
|
||||
if (!testExplorer) {
|
||||
|
|
@ -289,8 +288,8 @@ export class CTestDriver implements vscode.Disposable {
|
|||
} else {
|
||||
const tests = this.testItemCollectionToArray(testExplorer.items);
|
||||
const run = testExplorer.createTestRun(new vscode.TestRunRequest());
|
||||
const ctestArgs = await this.getCTestArgs(driver, useCMakePresets, customizedTask, testPreset);
|
||||
const returnCode = await this.runCTestHelper(tests, run, useCMakePresets, driver, undefined, ctestArgs, undefined, customizedTask, consumer);
|
||||
const ctestArgs = await this.getCTestArgs(driver, customizedTask, testPreset);
|
||||
const returnCode = await this.runCTestHelper(tests, run, driver, undefined, ctestArgs, undefined, customizedTask, consumer);
|
||||
run.end();
|
||||
return returnCode;
|
||||
}
|
||||
|
|
@ -332,7 +331,7 @@ export class CTestDriver implements vscode.Disposable {
|
|||
run.failed(test, message, duration);
|
||||
}
|
||||
|
||||
private async runCTestHelper(tests: vscode.TestItem[], run: vscode.TestRun, useCMakePresets: boolean, driver?: CMakeDriver, ctestPath?: string, ctestArgs?: string[], cancellation?: vscode.CancellationToken, customizedTask: boolean = false, consumer?: proc.OutputConsumer): Promise<number> {
|
||||
private async runCTestHelper(tests: vscode.TestItem[], run: vscode.TestRun, driver?: CMakeDriver, ctestPath?: string, ctestArgs?: string[], cancellation?: vscode.CancellationToken, customizedTask: boolean = false, consumer?: proc.OutputConsumer): Promise<number> {
|
||||
let returnCode: number = 0;
|
||||
for (const test of tests) {
|
||||
if (cancellation && cancellation.isCancellationRequested) {
|
||||
|
|
@ -372,7 +371,7 @@ export class CTestDriver implements vscode.Disposable {
|
|||
if (ctestArgs) {
|
||||
_ctestArgs = ctestArgs;
|
||||
} else {
|
||||
_ctestArgs = await this.getCTestArgs(_driver, useCMakePresets, customizedTask);
|
||||
_ctestArgs = await this.getCTestArgs(_driver, customizedTask);
|
||||
}
|
||||
|
||||
if (!_ctestArgs) {
|
||||
|
|
@ -383,7 +382,7 @@ export class CTestDriver implements vscode.Disposable {
|
|||
if (test.children.size > 0) {
|
||||
// Shouldn't reach here now, but not hard to write so keeping it in case we want to have more complicated test hierarchies
|
||||
const children = this.testItemCollectionToArray(test.children);
|
||||
if (await this.runCTestHelper(children, run, useCMakePresets, _driver, _ctestPath, _ctestArgs, cancellation, customizedTask, consumer)) {
|
||||
if (await this.runCTestHelper(children, run, _driver, _ctestPath, _ctestArgs, cancellation, customizedTask, consumer)) {
|
||||
returnCode = -1;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -488,13 +487,13 @@ export class CTestDriver implements vscode.Disposable {
|
|||
* @brief Refresh the list of CTest tests
|
||||
* @returns 0 when successful
|
||||
*/
|
||||
async refreshTests(driver: CMakeDriver, useCMakePresets: boolean): Promise<number> {
|
||||
async refreshTests(driver: CMakeDriver): Promise<number> {
|
||||
if (util.isTestMode()) {
|
||||
// ProjectController can't be initialized in test mode, so we don't have a usable test explorer
|
||||
return 0;
|
||||
}
|
||||
|
||||
const initializedTestExplorer = this.ensureTestExplorerInitialized(useCMakePresets);
|
||||
const initializedTestExplorer = this.ensureTestExplorerInitialized();
|
||||
const sourceDir = util.platformNormalizePath(driver.sourceDir);
|
||||
const testExplorerRoot = initializedTestExplorer.items.get(sourceDir);
|
||||
if (!testExplorerRoot) {
|
||||
|
|
@ -518,10 +517,12 @@ export class CTestDriver implements vscode.Disposable {
|
|||
return -2;
|
||||
}
|
||||
|
||||
const ctestArgs = await this.getCTestArgs(driver, useCMakePresets);
|
||||
const ctestArgs = await this.getCTestArgs(driver);
|
||||
if (!ctestArgs) {
|
||||
log.info(localize('ctest.args.not.found', 'Could not get CTest arguments'));
|
||||
return -3;
|
||||
// Happens when testPreset is not selected
|
||||
const testItem = initializedTestExplorer.createTestItem(testPresetRequired, localize('test.preset.required', 'Select a test preset to discover tests'));
|
||||
testExplorerRoot.children.add(testItem);
|
||||
return 0;
|
||||
}
|
||||
if (!driver.cmake.version || util.versionLess(driver.cmake.version, { major: 3, minor: 14, patch: 0 })) {
|
||||
// ctest --show-only=json-v1 was added in CMake 3.14
|
||||
|
|
@ -602,7 +603,38 @@ export class CTestDriver implements vscode.Disposable {
|
|||
return uniqueTests;
|
||||
}
|
||||
|
||||
private async runTestHandler(request: vscode.TestRunRequest, cancellation: vscode.CancellationToken, useCMakePresets: boolean) {
|
||||
/**
|
||||
* This function checks if tests require test presets already have a test preset selected.
|
||||
* Check is done by looking for magic test item testPresetRequired. When test preset is not selected, there will
|
||||
* be one and only one such test item under that folder.
|
||||
* When test preset is not selected, this function will prompt for test preset selection. Changing test preset triggers
|
||||
* test explorer refresh.
|
||||
*
|
||||
* Returns false if any test preset wasn't selected already. This means either test explorer is going to be refreshed,
|
||||
* or user cancelled the selection. So we shouldn't proceed in most cases.
|
||||
*/
|
||||
private async checkTestPreset(tests: vscode.TestItem[]): Promise<boolean> {
|
||||
let presetMayChange = false;
|
||||
for (const test of tests) {
|
||||
if (test.id === testPresetRequired) {
|
||||
const folder = test.parent ? test.parent.id : test.id;
|
||||
const project = await this.projectController?.getProjectForFolder(folder);
|
||||
if (!project) {
|
||||
log.error(localize('no.project.found', 'No project found for folder {0}', folder));
|
||||
return false;
|
||||
}
|
||||
await vscode.commands.executeCommand('cmake.selectTestPreset', project.workspaceFolder);
|
||||
presetMayChange = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (presetMayChange) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private async runTestHandler(request: vscode.TestRunRequest, cancellation: vscode.CancellationToken) {
|
||||
if (!testExplorer) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -610,15 +642,24 @@ export class CTestDriver implements vscode.Disposable {
|
|||
const requestedTests = request.include || this.testItemCollectionToArray(testExplorer.items);
|
||||
const tests = this.uniqueTests(requestedTests);
|
||||
|
||||
if (!await this.checkTestPreset(tests)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const run = testExplorer.createTestRun(request);
|
||||
this.ctestsEnqueued(tests, run);
|
||||
await this.buildTests(tests, run);
|
||||
await this.runCTestHelper(tests, run, useCMakePresets, undefined, undefined, undefined, cancellation);
|
||||
await this.runCTestHelper(tests, run, undefined, undefined, undefined, cancellation);
|
||||
run.end();
|
||||
};
|
||||
|
||||
private async debugCTestHelper(tests: vscode.TestItem[], run: vscode.TestRun, cancellation: vscode.CancellationToken): Promise<number> {
|
||||
let returnCode: number = 0;
|
||||
|
||||
if (!await this.checkTestPreset(tests)) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
for (const test of tests) {
|
||||
if (cancellation && cancellation.isCancellationRequested) {
|
||||
run.skipped(test);
|
||||
|
|
@ -859,7 +900,7 @@ export class CTestDriver implements vscode.Disposable {
|
|||
* Initializes the VS Code Test Controller if it is not already initialized.
|
||||
* Should only be called by refreshTests since it adds tests to the controller.
|
||||
*/
|
||||
private ensureTestExplorerInitialized(useCMakePresets: boolean): vscode.TestController {
|
||||
private ensureTestExplorerInitialized(): vscode.TestController {
|
||||
if (!testExplorer) {
|
||||
testExplorer = vscode.tests.createTestController('cmakeToolsCTest', 'CTest');
|
||||
|
||||
|
|
@ -879,7 +920,7 @@ export class CTestDriver implements vscode.Disposable {
|
|||
testExplorer.createRunProfile(
|
||||
'Run Tests',
|
||||
vscode.TestRunProfileKind.Run,
|
||||
(request: vscode.TestRunRequest, cancellation: vscode.CancellationToken) => this.runTestHandler(request, cancellation, useCMakePresets),
|
||||
(request: vscode.TestRunRequest, cancellation: vscode.CancellationToken) => this.runTestHandler(request, cancellation),
|
||||
true
|
||||
);
|
||||
testExplorer.createRunProfile(
|
||||
|
|
|
|||
|
|
@ -486,35 +486,42 @@ export abstract class CMakeDriver implements vscode.Disposable {
|
|||
* Change the current configure preset. This lets the driver reload, if necessary.
|
||||
* @param configurePreset The new configure preset
|
||||
*/
|
||||
async setConfigurePreset(configurePreset: preset.ConfigurePreset): Promise<void> {
|
||||
if (!this.useCMakePresets) {
|
||||
log.info(localize('skip.set.config.preset', 'Using kits, skip setting configure preset: {0}', configurePreset.name));
|
||||
return;
|
||||
async setConfigurePreset(configurePreset: preset.ConfigurePreset | null): Promise<void> {
|
||||
if (configurePreset) {
|
||||
log.info(localize('switching.to.config.preset', 'Switching to configure preset: {0}', configurePreset.name));
|
||||
|
||||
const newBinaryDir = configurePreset.binaryDir;
|
||||
const needs_clean = this.binaryDir === newBinaryDir && preset.configurePresetChangeNeedsClean(configurePreset, this._configurePreset);
|
||||
await this.doSetConfigurePreset(needs_clean, async () => {
|
||||
await this._setConfigurePreset(configurePreset);
|
||||
});
|
||||
} else {
|
||||
log.info(localize('unsetting.config.preset', 'Unsetting configure preset'));
|
||||
|
||||
await this.doSetConfigurePreset(false, async () => {
|
||||
await this._setConfigurePreset(configurePreset);
|
||||
});
|
||||
}
|
||||
|
||||
log.info(localize('switching.to.config.preset', 'Switching to configure preset: {0}', configurePreset.name));
|
||||
|
||||
const newBinaryDir = configurePreset.binaryDir;
|
||||
const needs_clean = this.binaryDir === newBinaryDir && preset.configurePresetChangeNeedsClean(configurePreset, this._configurePreset);
|
||||
await this.doSetConfigurePreset(needs_clean, async () => {
|
||||
await this._setConfigurePreset(configurePreset);
|
||||
});
|
||||
}
|
||||
|
||||
private async _setConfigurePreset(configurePreset: preset.ConfigurePreset): Promise<void> {
|
||||
private async _setConfigurePreset(configurePreset: preset.ConfigurePreset | null): Promise<void> {
|
||||
this._configurePreset = configurePreset;
|
||||
log.debug(localize('cmakedriver.config.preset.set.to', 'CMakeDriver configure preset set to {0}', configurePreset.name));
|
||||
log.debug(localize('cmakedriver.config.preset.set.to', 'CMakeDriver configure preset set to {0}', configurePreset?.name || null));
|
||||
|
||||
this._binaryDir = configurePreset.binaryDir || '';
|
||||
this._binaryDir = configurePreset?.binaryDir || '';
|
||||
|
||||
if (configurePreset.generator) {
|
||||
this._generator = {
|
||||
name: configurePreset.generator,
|
||||
platform: configurePreset.architecture ? getValue(configurePreset.architecture) : undefined,
|
||||
toolset: configurePreset.toolset ? getValue(configurePreset.toolset) : undefined
|
||||
};
|
||||
if (configurePreset) {
|
||||
if (configurePreset.generator) {
|
||||
this._generator = {
|
||||
name: configurePreset.generator,
|
||||
platform: configurePreset.architecture ? getValue(configurePreset.architecture) : undefined,
|
||||
toolset: configurePreset.toolset ? getValue(configurePreset.toolset) : undefined
|
||||
};
|
||||
} else {
|
||||
log.debug(localize('no.generator', 'No generator specified'));
|
||||
}
|
||||
} else {
|
||||
log.debug(localize('no.generator', 'No generator specified'));
|
||||
this._generator = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -522,42 +529,42 @@ export abstract class CMakeDriver implements vscode.Disposable {
|
|||
* Change the current build preset
|
||||
* @param buildPreset The new build preset
|
||||
*/
|
||||
async setBuildPreset(buildPreset: preset.BuildPreset): Promise<void> {
|
||||
if (!this.useCMakePresets) {
|
||||
log.info(localize('skip.set.build.preset', 'Using kits, skip setting build preset: {0}', buildPreset.name));
|
||||
return;
|
||||
async setBuildPreset(buildPreset: preset.BuildPreset | null): Promise<void> {
|
||||
if (buildPreset) {
|
||||
log.info(localize('switching.to.build.preset', 'Switching to build preset: {0}', buildPreset.name));
|
||||
} else {
|
||||
log.info(localize('unsetting.build.preset', 'Unsetting build preset'));
|
||||
}
|
||||
|
||||
log.info(localize('switching.to.build.preset', 'Switching to build preset: {0}', buildPreset.name));
|
||||
await this.doSetBuildPreset(async () => {
|
||||
await this._setBuildPreset(buildPreset);
|
||||
});
|
||||
}
|
||||
|
||||
private async _setBuildPreset(buildPreset: preset.BuildPreset): Promise<void> {
|
||||
private async _setBuildPreset(buildPreset: preset.BuildPreset | null): Promise<void> {
|
||||
this._buildPreset = buildPreset;
|
||||
log.debug(localize('cmakedriver.build.preset.set.to', 'CMakeDriver build preset set to {0}', buildPreset.name));
|
||||
log.debug(localize('cmakedriver.build.preset.set.to', 'CMakeDriver build preset set to {0}', buildPreset?.name || null));
|
||||
}
|
||||
|
||||
/**
|
||||
* Change the current test preset
|
||||
* @param testPreset The new test preset
|
||||
*/
|
||||
async setTestPreset(testPreset: preset.TestPreset): Promise<void> {
|
||||
if (!this.useCMakePresets) {
|
||||
log.info(localize('skip.set.test.preset', 'Using kits, skip setting test preset: {0}', testPreset.name));
|
||||
return;
|
||||
async setTestPreset(testPreset: preset.TestPreset | null): Promise<void> {
|
||||
if (testPreset) {
|
||||
log.info(localize('switching.to.test.preset', 'Switching to test preset: {0}', testPreset.name));
|
||||
} else {
|
||||
log.info(localize('unsetting.test.preset', 'Unsetting test preset'));
|
||||
}
|
||||
|
||||
log.info(localize('switching.to.test.preset', 'Switching to test preset: {0}', testPreset.name));
|
||||
await this.doSetTestPreset(async () => {
|
||||
await this._setTestPreset(testPreset);
|
||||
});
|
||||
}
|
||||
|
||||
private async _setTestPreset(testPreset: preset.TestPreset): Promise<void> {
|
||||
private async _setTestPreset(testPreset: preset.TestPreset | null): Promise<void> {
|
||||
this._testPreset = testPreset;
|
||||
log.debug(localize('cmakedriver.test.preset.set.to', 'CMakeDriver test preset set to {0}', testPreset.name));
|
||||
log.debug(localize('cmakedriver.test.preset.set.to', 'CMakeDriver test preset set to {0}', testPreset?.name || null));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -940,9 +940,17 @@ export class ExtensionManager implements vscode.Disposable {
|
|||
*/
|
||||
async setConfigurePreset(presetName: string, folder?: vscode.WorkspaceFolder) {
|
||||
if (folder) {
|
||||
if (!this.useCMakePresets(folder)) {
|
||||
log.info(localize('skip.set.config.preset', 'Using kits, skip setting configure preset: {0}', presetName));
|
||||
return;
|
||||
}
|
||||
await this.getActiveProject()?.presetsController.setConfigurePreset(presetName);
|
||||
} else {
|
||||
for (const project of this.projectController.getAllCMakeProjects()) {
|
||||
if (!project.useCMakePresets) {
|
||||
log.info(localize('skip.set.config.preset', 'Using kits, skip setting configure preset: {0}', presetName));
|
||||
return;
|
||||
}
|
||||
await project.presetsController.setConfigurePreset(presetName);
|
||||
}
|
||||
}
|
||||
|
|
@ -950,9 +958,17 @@ export class ExtensionManager implements vscode.Disposable {
|
|||
|
||||
async setBuildPreset(presetName: string, folder?: vscode.WorkspaceFolder) {
|
||||
if (folder) {
|
||||
if (!this.useCMakePresets(folder)) {
|
||||
log.info(localize('skip.set.build.preset', 'Using kits, skip setting build preset: {0}', presetName));
|
||||
return;
|
||||
}
|
||||
await this.getActiveProject()?.presetsController.setBuildPreset(presetName);
|
||||
} else {
|
||||
for (const project of this.projectController.getAllCMakeProjects()) {
|
||||
if (!project.useCMakePresets) {
|
||||
log.info(localize('skip.set.build.preset', 'Using kits, skip setting build preset: {0}', presetName));
|
||||
return;
|
||||
}
|
||||
await project.presetsController.setBuildPreset(presetName);
|
||||
}
|
||||
}
|
||||
|
|
@ -960,9 +976,17 @@ export class ExtensionManager implements vscode.Disposable {
|
|||
|
||||
async setTestPreset(presetName: string, folder?: vscode.WorkspaceFolder) {
|
||||
if (folder) {
|
||||
if (!this.useCMakePresets(folder)) {
|
||||
log.info(localize('skip.set.test.preset', 'Using kits, skip setting test preset: {0}', presetName));
|
||||
return;
|
||||
}
|
||||
await this.getActiveProject()?.presetsController.setTestPreset(presetName);
|
||||
} else {
|
||||
for (const project of this.projectController.getAllCMakeProjects()) {
|
||||
if (!project.useCMakePresets) {
|
||||
log.info(localize('skip.set.test.preset', 'Using kits, skip setting test preset: {0}', presetName));
|
||||
return;
|
||||
}
|
||||
await project.presetsController.setTestPreset(presetName);
|
||||
}
|
||||
}
|
||||
|
|
@ -1593,6 +1617,11 @@ export class ExtensionManager implements vscode.Disposable {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!project.useCMakePresets) {
|
||||
log.info(localize('skip.set.configure.preset', 'Using kits, skip selecting configure preset'));
|
||||
return false;
|
||||
}
|
||||
|
||||
const presetSelected = await project.presetsController.selectConfigurePreset();
|
||||
const configurePreset = project.configurePreset;
|
||||
this.statusBar.setConfigurePresetName(configurePreset?.displayName || configurePreset?.name || '');
|
||||
|
|
@ -1619,6 +1648,11 @@ export class ExtensionManager implements vscode.Disposable {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!project.useCMakePresets) {
|
||||
log.info(localize('skip.set.build.preset', 'Using kits, skip selecting build preset'));
|
||||
return false;
|
||||
}
|
||||
|
||||
const presetSelected = await project.presetsController.selectBuildPreset();
|
||||
const buildPreset = project.buildPreset;
|
||||
this.statusBar.setBuildPresetName(buildPreset?.displayName || buildPreset?.name || '');
|
||||
|
|
@ -1639,6 +1673,11 @@ export class ExtensionManager implements vscode.Disposable {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!project.useCMakePresets) {
|
||||
log.info(localize('skip.set.test.preset', 'Using kits, skip selecting test preset'));
|
||||
return false;
|
||||
}
|
||||
|
||||
const presetSelected = await project.presetsController.selectTestPreset();
|
||||
const testPreset = project.testPreset;
|
||||
this.statusBar.setTestPresetName(testPreset?.displayName || testPreset?.name || '');
|
||||
|
|
|
|||
|
|
@ -899,6 +899,7 @@ export class PresetsController {
|
|||
} else {
|
||||
log.debug(localize('user.selected.test.preset', 'User selected test preset {0}', JSON.stringify(chosenPreset)));
|
||||
await this.setTestPreset(chosenPreset, false);
|
||||
await vscode.commands.executeCommand('cmake.refreshTests', this.workspaceFolder);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ export class ProjectController implements vscode.Disposable {
|
|||
this.launchTargetSub = project.onLaunchTargetNameChanged(FireNow, () => void projectStatus.refresh());
|
||||
this.ctestEnabledSub = project.onCTestEnabledChanged(FireNow, () => void projectStatus.refresh());
|
||||
this.activeConfigurePresetSub = project.onActiveConfigurePresetChanged(FireNow, () => void projectStatus.refresh());
|
||||
this.activeBuildPresetSub = project.onActiveConfigurePresetChanged(FireNow, () => void projectStatus.refresh());
|
||||
this.activeBuildPresetSub = project.onActiveBuildPresetChanged(FireNow, () => void projectStatus.refresh());
|
||||
this.activeTestPresetSub = project.onActiveTestPresetChanged(FireNow, () => void projectStatus.refresh());
|
||||
this.isBusySub = project.onIsBusyChanged(FireNow, (isBusy) => void projectStatus.setIsBusy(isBusy));
|
||||
await util.setContextValue(ext.hideBuildCommandKey, project.hideBuildButton);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче