Revert back to Electron 12.0.7 (microsoft#126026)

* Revert "chore: bump electron@12.0.9"

This reverts commit 286b643.

* Revert "macOS - workaround fullscreen window regression (microsoft#125122)"

This reverts commit a286059.

Author: bpasero

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "12.0.9"
+target "12.0.7"
 runtime "electron"

cgmanifest.json

@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "30f82dd1cb8140ccb5c6a4960eef8e3b8c15eeba"
+					"commitHash": "8d55658bfa8b5983e1a90ad079c2e2ac91ee7af0"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "12.0.9"
+			"version": "12.0.7"
 		},
 		{
 			"component": {

package.json

@@ -125,7 +125,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "12.0.9",
+    "electron": "12.0.7",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",

src/vs/platform/windows/electron-main/windowsStateHandler.ts

@@ -232,11 +232,9 @@ export class WindowsStateHandler extends Disposable {
 		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
 
 		// Window state is not from a previous session: only allow fullscreen if we inherit it or user wants fullscreen
-		// or to address a Electron issue on macOS (https://github.com/microsoft/vscode/issues/125122)
 		let allowFullscreen: boolean;
 		if (state.hasDefaultState) {
-			const configAllowsFullScreen = !!(windowConfig?.newWindowDimensions && ['fullscreen', 'inherit', 'offset'].indexOf(windowConfig.newWindowDimensions) >= 0);
-			allowFullscreen = configAllowsFullScreen || (isMacintosh && windowConfig?.nativeFullScreen !== false);
+			allowFullscreen = !!(windowConfig?.newWindowDimensions && ['fullscreen', 'inherit', 'offset'].indexOf(windowConfig.newWindowDimensions) >= 0);
 		}
 
 		// Window state is from a previous session: only allow fullscreen when we got updated or user wants to restore
@@ -339,22 +337,14 @@ export class WindowsStateHandler extends Disposable {
 		// Compute x/y based on display bounds
 		// Note: important to use Math.round() because Electron does not seem to be too happy about
 		// display coordinates that are not absolute numbers.
-		let state: INewWindowState = defaultWindowState();
+		let state = defaultWindowState();
 		state.x = Math.round(displayToUse.bounds.x + (displayToUse.bounds.width / 2) - (state.width! / 2));
 		state.y = Math.round(displayToUse.bounds.y + (displayToUse.bounds.height / 2) - (state.height! / 2));
 
+		// Check for newWindowDimensions setting and adjust accordingly
 		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
 		let ensureNoOverlap = true;
-
-		// TODO@electron macOS: if the current window is fullscreen and native fullscreen
-		// is not disabled, always open a new window in fullscreen. This is a workaround
-		// for regression https://github.com/microsoft/vscode/issues/125122
-		if (isMacintosh && windowConfig?.nativeFullScreen !== false && lastActive?.isFullScreen) {
-			state.mode = WindowMode.Fullscreen;
-		}
-
-		// Adjust according to `newWindowDimensions` user setting
-		else if (windowConfig?.newWindowDimensions) {
+		if (windowConfig?.newWindowDimensions) {
 			if (windowConfig.newWindowDimensions === 'maximized') {
 				state.mode = WindowMode.Maximized;
 				ensureNoOverlap = false;
@@ -377,7 +367,7 @@ export class WindowsStateHandler extends Disposable {
 			state = this.ensureNoOverlap(state);
 		}
 
-		state.hasDefaultState = true; // flag as default state
+		(state as INewWindowState).hasDefaultState = true; // flag as default state
 
 		return state;
 	}

yarn.lock

@@ -3001,10 +3001,10 @@ electron-to-chromium@^1.3.723:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz#196f2e9656f4f3c31930750e1899c091b72d36b5"
   integrity sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==
 
-electron@12.0.9:
-  version "12.0.9"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.9.tgz#d582afa8f6fc0c429606f0961a4c89b376994823"
-  integrity sha512-p5aEt1tIh/PYjwN+6MHTc5HtW529XR9r4Qlj9PPcSb5ubkotSsS0BtWJoRPhDenSAN8sgHk3sbZLxXPJtdnRYA==
+electron@12.0.7:
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.7.tgz#e0fca2c8be34cb7da48c4d15cfb1d2ad666d2718"
+  integrity sha512-722TZNKDuLpEmj96AzTYFKHaJEH98xgOBH0aldStaPXI1xDFfb9SJQQuirvwFlkwG5OqQdz6Ne3OwwJ7Dbs5nQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"