Closing dialog does not cancel (Manjaro Linux) (fix microsoft#154719) (microsoft#155049)

* Closing dialog does not cancel (Manjaro Linux) (fix microsoft#154719)

* set `cancelId`

Author: bpasero

src/vs/platform/dialogs/common/dialogs.ts

@@ -273,6 +273,11 @@ export interface IDialogService {
 	/**
 	 * Present a modal dialog to the user.
 	 *
+	 * @param severity the severity of the message
+	 * @param message the message to show
+	 * @param buttons the buttons to show. By convention, the first button should be the
+	 * primary action and the last button the "Cancel" action.
+	 *
 	 * @returns A promise with the selected choice index. If the user refused to choose,
 	 * then a promise with index of `cancelId` option is returned. If there is no such
 	 * option then promise with index `0` is returned.

src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts

@@ -122,11 +122,14 @@ class BulkEditPreviewContribution {
 			const choice = await this._dialogService.show(
 				Severity.Info,
 				localize('overlap', "Another refactoring is being previewed."),
-				[localize('cancel', "Cancel"), localize('continue', "Continue")],
-				{ detail: localize('detail', "Press 'Continue' to discard the previous refactoring and continue with the current refactoring.") }
+				[localize('continue', "Continue"), localize('cancel', "Cancel")],
+				{
+					detail: localize('detail', "Press 'Continue' to discard the previous refactoring and continue with the current refactoring."),
+					cancelId: 1
+				}
 			);
 
-			if (choice.choice === 0) {
+			if (choice.choice === 1) {
 				// this refactoring is being cancelled
 				return [];
 			}

src/vs/workbench/contrib/format/browser/formatActionsNone.ts

@@ -68,9 +68,10 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 			const res = await dialogService.show(
 				Severity.Info,
 				message,
-				[nls.localize('cancel', "Cancel"), nls.localize('install.formatter', "Install Formatter...")]
+				[nls.localize('install.formatter', "Install Formatter..."), nls.localize('cancel', "Cancel")],
+				{ cancelId: 1 }
 			);
-			if (res.choice === 1) {
+			if (res.choice !== 1) {
 				showExtensionQuery(paneCompositeService, `category:formatters ${langName}`);
 			}
 		}