Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/src/vs/platform/files/electron-browser/diskFileSystemProvider.ts

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DiskFileSystemProvider as NodeDiskFileSystemProvider, IDiskFileSystemProviderOptions } from 'vs/platform/files/node/diskFileSystemProvider';
+import { FileDeleteOptions, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
+import { isWindows } from 'vs/base/common/platform';
+import { localize } from 'vs/nls';
+import { basename } from 'vs/base/common/path';
+import { ILogService } from 'vs/platform/log/common/log';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+
+export class DiskFileSystemProvider extends NodeDiskFileSystemProvider {
+
+	constructor(
+		logService: ILogService,
+		private readonly nativeHostService: INativeHostService,
+		options?: IDiskFileSystemProviderOptions
+	) {
+		super(logService, options);
+	}
+
+	get capabilities(): FileSystemProviderCapabilities {
+		if (!this._capabilities) {
+			this._capabilities = super.capabilities | FileSystemProviderCapabilities.Trash;
+		}
+
+		return this._capabilities;
+	}
+
+	protected async doDelete(filePath: string, opts: FileDeleteOptions): Promise<void> {
+		if (!opts.useTrash) {
+			return super.doDelete(filePath, opts);
+		}
+
+		const result = await this.nativeHostService.moveItemToTrash(filePath);
+		if (!result) {
+			throw new Error(isWindows ? localize('binFailed', "Failed to move '{0}' to the recycle bin", basename(filePath)) : localize('trashFailed', "Failed to move '{0}' to the trash", basename(filePath)));
+		}
+	}
+}