ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where errors during project update were swallowed (#22612) (#22615)

Browse Source 
* adding errors

* Fixing bug where errors occurring during updating project got swallowed

* removing unnecessary "vscode"
This commit is contained in:
Benjin Dubishar
2023-04-04 13:34:49 -07:00
committed by GitHub
parent 9f9d84b4ee
commit 11304d9090
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -298,12 +298,17 @@ export class ProjectsController {
argument: this.buildHelper.constructBuildArguments(project.projectFilePath, this.buildHelper.extensionBuildDirPath, project.sqlProjStyle)
};
const crossPlatCompatible: boolean = await Project.checkPromptCrossPlatStatus(project, true /* blocking prompt */);
try {
const crossPlatCompatible: boolean = await Project.checkPromptCrossPlatStatus(project, true /* blocking prompt */);
if (!crossPlatCompatible) {
// user rejected updating for cross-plat
void vscode.window.showErrorMessage(constants.projectNeedsUpdatingForCrossPlat(project.projectFileName));
return ''
if (!crossPlatCompatible) {
// user rejected updating for cross-plat
void vscode.window.showErrorMessage(constants.projectNeedsUpdatingForCrossPlat(project.projectFileName));
return ''
}
} catch (error) {
void vscode.window.showErrorMessage(utils.getErrorMessage(error));
return '';
}
try {

14
extensions/sql-database-projects/src/models/project.ts
View File

@@ -184,11 +184,17 @@ export class Project implements ISqlProject {
}
} else {
// use "void" with a .then() to not block the UI thread while prompting the user
void window.showErrorMessage(constants.updateProjectForCrossPlatform(project.projectFileName), constants.yesString, constants.noString).then(async (result) => {
if (result === constants.yesString) {
await project.updateProjectForCrossPlatform();
void window.showErrorMessage(constants.updateProjectForCrossPlatform(project.projectFileName), constants.yesString, constants.noString).then(
async (result) => {
if (result === constants.yesString) {
try {
await project.updateProjectForCrossPlatform();
} catch (error) {
void window.showErrorMessage(utils.getErrorMessage(utils.getErrorMessage(error)));
}
}
}
});
);
}
return project.isCrossPlatformCompatible;