Merge branch 'master' of https://github.com/microsoft/vscode

joaomoreno · joaomoreno · commit 697b702e47d0 · 2020-07-02T09:47:42.000+02:00
diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts
@@ -263,7 +263,7 @@ export class NativeStorageService extends Disposable implements IStorageService
 
 	async migrate(toWorkspace: IWorkspaceInitializationPayload): Promise<void> {
 		if (this.workspaceStoragePath === SQLiteStorageDatabase.IN_MEMORY_PATH) {
-			return Promise.resolve(); // no migration needed if running in memory
+			return; // no migration needed if running in memory
 		}
 
 		// Close workspace DB to be able to copy

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ export class NativeStorageService extends Disposable implements IStorageService`
`263`	`263`
`264`	`264`	`async migrate(toWorkspace: IWorkspaceInitializationPayload): Promise<void> {`
`265`	`265`	`if (this.workspaceStoragePath === SQLiteStorageDatabase.IN_MEMORY_PATH) {`
`266`		`- return Promise.resolve(); // no migration needed if running in memory`
	`266`	`+ return; // no migration needed if running in memory`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`// Close workspace DB to be able to copy`