coder · code-asher · Apr 3, 2019 · Apr 3, 2019
diff --git a/packages/vscode/src/workbench.ts b/packages/vscode/src/workbench.ts
@@ -1,5 +1,6 @@
 import * as os from "os";
 import { IProgress, INotificationHandle } from "@coder/ide";
+import { logger } from "@coder/logger";
 import { client } from "./client";
 
 import "./fill/platform";
@@ -28,26 +29,38 @@ import { LogLevel } from "vs/platform/log/common/log";
 import { RawContextKey, IContextKeyService } from "vs/platform/contextkey/common/contextkey";
 import { ServiceCollection } from "vs/platform/instantiation/common/serviceCollection";
 import { URI } from "vs/base/common/uri";
+import { BackupMainService } from "vs/platform/backup/electron-main/backupMainService";
+import { IInstantiationService } from "vs/platform/instantiation/common/instantiation";
 
+/**
+ * Initializes VS Code and provides a way to call into general client
+ * functionality.
+ */
 export class Workbench {
 	public readonly retry = client.retry;
 
 	private readonly windowId = parseInt(new Date().toISOString().replace(/[-:.TZ]/g, ""), 10);
 	private _serviceCollection: ServiceCollection | undefined;
 	private _clipboardContextKey: RawContextKey<boolean> | undefined;
 
+	/**
+	 * Handle a drop event on the file explorer.
+	 */
 	public async handleExternalDrop(target: ExplorerItem | ExplorerModel, originalEvent: DragEvent): Promise<void> {
 		await client.upload.uploadDropped(
 			originalEvent,
 			(target instanceof ExplorerItem ? target : target.roots[0]).resource,
 		);
 	}
 
+	/**
+	 * Handle a drop event on the editor.
+	 */
 	public handleDrop(event: DragEvent, resolveTargetGroup: () => IEditorGroup, afterDrop: (targetGroup: IEditorGroup) => void, targetIndex?: number): void {
-		client.upload.uploadDropped(event, URI.file(paths.getWorkingDirectory())).then((paths) => {
+		client.upload.uploadDropped(event, URI.file(paths.getWorkingDirectory())).then(async (paths) => {
 			const uris = paths.map((p) => URI.file(p));
 			if (uris.length) {
-				(this.serviceCollection.get(IWindowsService) as IWindowsService).addRecentlyOpened(uris);
+				await (this.serviceCollection.get(IWindowsService) as IWindowsService).addRecentlyOpened(uris);
 			}
 
 			const editors: IResourceEditor[] = uris.map(uri => ({
@@ -59,10 +72,10 @@ export class Workbench {
 			}));
 
 			const targetGroup = resolveTargetGroup();
-
-			(this.serviceCollection.get(IEditorService) as IEditorService).openEditors(editors, targetGroup).then(() => {
-				afterDrop(targetGroup);
-			});
+			await (this.serviceCollection.get(IEditorService) as IEditorService).openEditors(editors, targetGroup);
+			afterDrop(targetGroup);
+		}).catch((error) => {
+			logger.error(error.message);
 		});
 	}
 
@@ -117,6 +130,15 @@ export class Workbench {
 
 	public set serviceCollection(collection: ServiceCollection) {
 		this._serviceCollection = collection;
+
+		// TODO: If possible it might be better to start the app from vs/code/electron-main/app.
+		// For now, manually initialize services from there as needed.
+		const inst = this._serviceCollection.get(IInstantiationService) as IInstantiationService;
+		const backupMainService = inst.createInstance(BackupMainService) as BackupMainService;
+		backupMainService.initialize().catch((error) => {
+			logger.error(error.message);
+		});
+
 		client.progressService = {
 			start: <T>(title: string, task: (progress: IProgress) => Promise<T>, onCancel: () => void): Promise<T> => {
 				let lastProgress = 0;
@@ -166,6 +188,9 @@ export class Workbench {
 		};
 	}
 
+	/**
+	 * Start VS Code.
+	 */
 	public async initialize(): Promise<void> {
 		this._clipboardContextKey = new RawContextKey("nativeClipboard", client.clipboard.isEnabled);