another fix for microsoft#62719

Benjamin Pasero · Benjamin Pasero · commit 3c8302a76248 · 2018-11-30T17:56:31.000+01:00
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
@@ -169,11 +169,12 @@ function registerDeveloperKeybindings() {
 
 	// Devtools & reload support
 	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+	const TOGGLE_DEV_TOOLS_KB_ALT = '123'; // F12
 	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
 
 	let listener = function (e) {
 		const key = extractKey(e);
-		if (key === TOGGLE_DEV_TOOLS_KB) {
+		if (key === TOGGLE_DEV_TOOLS_KB || key === TOGGLE_DEV_TOOLS_KB_ALT) {
 			ipc.send('vscode:toggleDevTools');
 		} else if (key === RELOAD_KB) {
 			ipc.send('vscode:reloadWindow');
diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts
@@ -719,8 +719,11 @@ export class Menubar {
 		}
 
 		if (activeWindow) {
-			if (!activeWindow.isReady && isMacintosh && id === 'workbench.action.toggleDevTools') {
-				return; // prevent this action from running twice on macOS (https://github.com/Microsoft/vscode/issues/62719)
+			if (!activeWindow.isReady && isMacintosh && id === 'workbench.action.toggleDevTools' && !this.environmentService.isBuilt) {
+				// prevent this action from running twice on macOS (https://github.com/Microsoft/vscode/issues/62719)
+				// we already register a keybinding in bootstrap-window.js for opening developer tools in case something
+				// goes wrong and that keybinding is only removed when the application has loaded (= window ready).
+				return;
 			}
 
 			this.windowsMainService.sendToFocused('vscode:runAction', { id, from: 'menu' } as IRunActionInWindowRequest);

Original file line number	Diff line number	Diff line change
`@@ -719,8 +719,11 @@ export class Menubar {`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`if (activeWindow) {`
`722`		`- if (!activeWindow.isReady && isMacintosh && id === 'workbench.action.toggleDevTools') {`
`723`		`- return; // prevent this action from running twice on macOS (https://github.com/Microsoft/vscode/issues/62719)`
	`722`	`+ if (!activeWindow.isReady && isMacintosh && id === 'workbench.action.toggleDevTools' && !this.environmentService.isBuilt) {`
	`723`	`+ // prevent this action from running twice on macOS (https://github.com/Microsoft/vscode/issues/62719)`
	`724`	`+ // we already register a keybinding in bootstrap-window.js for opening developer tools in case something`
	`725`	`+ // goes wrong and that keybinding is only removed when the application has loaded (= window ready).`
	`726`	`+ return;`
`724`	`727`	`}`
`725`	`728`
`726`	`729`	`this.windowsMainService.sendToFocused('vscode:runAction', { id, from: 'menu' } as IRunActionInWindowRequest);`