fix #76232 (#77266)

src/vs/base/browser/ui/dialog/dialog.ts

@@ -15,7 +15,7 @@ import { ButtonGroup, IButtonStyles } from 'vs/base/browser/ui/button/button';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh, isLinux } from 'vs/base/common/platform';
 
 export interface IDialogOptions {
 	cancelId?: number;
@@ -97,9 +97,9 @@ export class Dialog extends Disposable {
 			clearNode(this.buttonsContainer);
 
 			let focusedButton = 0;
-			this.buttonGroup = new ButtonGroup(this.buttonsContainer, this.buttons.length, { title: true });
+			const buttonGroup = this.buttonGroup = new ButtonGroup(this.buttonsContainer, this.buttons.length, { title: true });
 			const buttonMap = this.rearrangeButtons(this.buttons, this.options.cancelId);
-			this.buttonGroup.buttons.forEach((button, index) => {
+			buttonGroup.buttons.forEach((button, index) => {
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 
 				this._register(button.onDidClick(e => {
@@ -115,18 +115,16 @@ export class Dialog extends Disposable {
 				}
 
 				let eventHandled = false;
-				if (this.buttonGroup) {
-					if (evt.equals(KeyMod.Shift | KeyCode.Tab) || evt.equals(KeyCode.LeftArrow)) {
-						focusedButton = focusedButton + this.buttonGroup.buttons.length - 1;
-						focusedButton = focusedButton % this.buttonGroup.buttons.length;
-						this.buttonGroup.buttons[focusedButton].focus();
-						eventHandled = true;
-					} else if (evt.equals(KeyCode.Tab) || evt.equals(KeyCode.RightArrow)) {
-						focusedButton++;
-						focusedButton = focusedButton % this.buttonGroup.buttons.length;
-						this.buttonGroup.buttons[focusedButton].focus();
-						eventHandled = true;
-					}
+				if (evt.equals(KeyMod.Shift | KeyCode.Tab) || evt.equals(KeyCode.LeftArrow)) {
+					focusedButton = focusedButton + buttonGroup.buttons.length - 1;
+					focusedButton = focusedButton % buttonGroup.buttons.length;
+					buttonGroup.buttons[focusedButton].focus();
+					eventHandled = true;
+				} else if (evt.equals(KeyCode.Tab) || evt.equals(KeyCode.RightArrow)) {
+					focusedButton++;
+					focusedButton = focusedButton % buttonGroup.buttons.length;
+					buttonGroup.buttons[focusedButton].focus();
+					eventHandled = true;
 				}
 
 				if (eventHandled) {
@@ -192,7 +190,11 @@ export class Dialog extends Disposable {
 			show(this.element);
 
 			// Focus first element
-			this.buttonGroup.buttons[focusedButton].focus();
+			buttonMap.forEach((value, index) => {
+				if (value.index === focusedButton) {
+					buttonGroup.buttons[index].focus();
+				}
+			});
 		});
 	}
 
@@ -243,7 +245,8 @@ export class Dialog extends Disposable {
 			buttonMap.push({ label: button, index: index });
 		});
 
-		if (isMacintosh) {
+		// macOS/linux: reverse button order
+		if (isMacintosh || isLinux) {
 			if (cancelId !== undefined) {
 				const cancelButton = buttonMap.splice(cancelId, 1)[0];
 				buttonMap.reverse();