extensions development - fix broken extension-development-confirm-save support

Benjamin Pasero · Benjamin Pasero · commit feab34eaf048 · 2020-02-26T19:37:49.000+01:00
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -92,6 +92,10 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 			return ConfirmResult.DONT_SAVE; // no veto when we are in extension dev mode because we cannot assume we run interactive (e.g. tests)
 		}
 
+		return this.doShowSaveConfirm(fileNamesOrResources);
+	}
+
+	protected async doShowSaveConfirm(fileNamesOrResources: (string | URI)[]): Promise<ConfirmResult> {
 		if (fileNamesOrResources.length === 0) {
 			return ConfirmResult.DONT_SAVE;
 		}
diff --git a/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts
@@ -198,7 +198,7 @@ export class FileDialogService extends AbstractFileDialogService implements IFil
 			}
 		}
 
-		return super.showSaveConfirm(fileNamesOrResources);
+		return super.doShowSaveConfirm(fileNamesOrResources);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ export abstract class AbstractFileDialogService implements IFileDialogService {`
`92`	`92`	`return ConfirmResult.DONT_SAVE; // no veto when we are in extension dev mode because we cannot assume we run interactive (e.g. tests)`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ return this.doShowSaveConfirm(fileNamesOrResources);`
	`96`	`+ }`
	`97`	`+`
	`98`	`+ protected async doShowSaveConfirm(fileNamesOrResources: (string \| URI)[]): Promise<ConfirmResult> {`
`95`	`99`	`if (fileNamesOrResources.length === 0) {`
`96`	`100`	`return ConfirmResult.DONT_SAVE;`
`97`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ export class FileDialogService extends AbstractFileDialogService implements IFil`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`
`201`		`- return super.showSaveConfirm(fileNamesOrResources);`
	`201`	`+ return super.doShowSaveConfirm(fileNamesOrResources);`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`