Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 (#5607)

src/vs/base/node/config.ts

@@ -9,7 +9,8 @@ import * as objects from 'vs/base/common/objects';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as json from 'vs/base/common/json';
-import { readlink, statLink } from 'vs/base/node/pfs';
+import { statLink } from 'vs/base/node/pfs';
+import { realpath } from 'vs/base/node/extpath';
 import { watchFolder, watchFile } from 'vs/base/node/watcher';
 
 export interface IConfigurationChangeEvent<T> {
@@ -130,7 +131,7 @@ export class ConfigWatcher<T> implements IConfigWatcher<T>, IDisposable {
 	private async handleSymbolicLink(): Promise<void> {
 		const { stat, isSymbolicLink } = await statLink(this._path);
 		if (isSymbolicLink && !stat.isDirectory()) {
-			const realPath = await readlink(this._path);
+			const realPath = await realpath(this._path);
 
 			this.watch(realPath, false);
 		}

src/vs/base/node/pfs.ts

@@ -213,10 +213,6 @@ export function symlink(target: string, path: string, type?: string): Promise<vo
 	return promisify(fs.symlink)(target, path, type);
 }
 
-export function readlink(path: string): Promise<string> {
-	return promisify(fs.readlink)(path);
-}
-
 export function truncate(path: string, len: number): Promise<void> {
 	return promisify(fs.truncate)(path, len);
 }

src/vs/base/node/storage.ts

@@ -554,10 +554,12 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 		return integrity;
 	}
 
-	private connect(path: string, retryOnBusy: boolean = true): Promise<IDatabaseConnection> {
+	private async connect(path: string, retryOnBusy: boolean = true): Promise<IDatabaseConnection> {
 		this.logger.trace(`[storage ${this.name}] open(${path}, retryOnBusy: ${retryOnBusy})`);
 
-		return this.doConnect(path).then(undefined, error => {
+		try {
+			return await this.doConnect(path);
+		} catch (error) {
 			this.logger.error(`[storage ${this.name}] open(): Unable to open DB due to ${error}`);
 
 			// SQLITE_BUSY should only arise if another process is locking the same DB we want
@@ -569,7 +571,9 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 			// In this case we simply wait for some time and retry once to establish the connection.
 			//
 			if (error.code === 'SQLITE_BUSY' && retryOnBusy) {
-				return timeout(SQLiteStorageDatabase.BUSY_OPEN_TIMEOUT).then(() => this.connect(path, false /* not another retry */));
+				await timeout(SQLiteStorageDatabase.BUSY_OPEN_TIMEOUT);
+
+				return this.connect(path, false /* not another retry */);
 			}
 
 			// Otherwise, best we can do is to recover from a backup if that exists, as such we
@@ -579,17 +583,19 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 			// The final fallback is to use an in-memory DB which should only happen if the target
 			// folder is really not writeable for us.
 			//
-			return unlink(path)
-				.then(() => renameIgnoreError(this.toBackupPath(path), path))
-				.then(() => this.doConnect(path))
-				.then(undefined, error => {
-					this.logger.error(`[storage ${this.name}] open(): Unable to use backup due to ${error}`);
+			try {
+				await unlink(path);
+				await renameIgnoreError(this.toBackupPath(path), path);
 
-					// In case of any error to open the DB, use an in-memory
-					// DB so that we always have a valid DB to talk to.
-					return this.doConnect(SQLiteStorageDatabase.IN_MEMORY_PATH);
-				});
-		});
+				return await this.doConnect(path);
+			} catch (error) {
+				this.logger.error(`[storage ${this.name}] open(): Unable to use backup due to ${error}`);
+
+				// In case of any error to open the DB, use an in-memory
+				// DB so that we always have a valid DB to talk to.
+				return this.doConnect(SQLiteStorageDatabase.IN_MEMORY_PATH);
+			}
+		}
 	}
 
 	private handleSQLiteError(connection: IDatabaseConnection, error: Error & { code?: string }, msg: string): void {