Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

src/vs/platform/userDataSync/electron-browser/userDataAutoSync.ts

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IUserDataSyncService, IUserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSync';
+import { Event } from 'vs/base/common/event';
+import { IElectronService } from 'vs/platform/electron/node/electron';
+import { UserDataAutoSync as BaseUserDataAutoSync } from 'vs/platform/userDataSync/common/userDataAutoSync';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IAuthTokenService } from 'vs/platform/auth/common/auth';
+
+export class UserDataAutoSync extends BaseUserDataAutoSync {
+
+	constructor(
+		@IUserDataSyncService userDataSyncService: IUserDataSyncService,
+		@IElectronService electronService: IElectronService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IUserDataSyncLogService logService: IUserDataSyncLogService,
+		@IAuthTokenService authTokenService: IAuthTokenService,
+	) {
+		super(configurationService, userDataSyncService, logService, authTokenService);
+
+		// Sync immediately if there is a local change.
+		this._register(Event.debounce(Event.any<any>(
+			electronService.onWindowFocus,
+			electronService.onWindowOpen,
+			userDataSyncService.onDidChangeLocal
+		), () => undefined, 500)(() => this.sync(false)));
+	}
+
+}