Disk file system provider cannot delete empty folders (fix microsoft#181898) (microsoft#181899)

* Disk file system provider cannot delete empty folders (fix microsoft#181898)

* forgot to throw original error

* more tests

* skip for symlinks

Author: bpasero

src/vs/platform/files/node/diskFileSystemProvider.ts

@@ -540,11 +540,36 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 	async delete(resource: URI, opts: IFileDeleteOptions): Promise<void> {
 		try {
 			const filePath = this.toFilePath(resource);
-
 			if (opts.recursive) {
 				await Promises.rm(filePath, RimRafMode.MOVE);
 			} else {
-				await Promises.unlink(filePath);
+				try {
+					await Promises.unlink(filePath);
+				} catch (unlinkError) {
+
+					// `fs.unlink` will throw when used on directories
+					// we try to detect this error and then see if the
+					// provided resource is actually a directory. in that
+					// case we use `fs.rmdir` to delete the directory.
+
+					if (unlinkError.code === 'EPERM' || unlinkError.code === 'EISDIR') {
+						let isDirectory = false;
+						try {
+							const { stat, symbolicLink } = await SymlinkSupport.stat(filePath);
+							isDirectory = stat.isDirectory() && !symbolicLink;
+						} catch (statError) {
+							// ignore
+						}
+
+						if (isDirectory) {
+							await Promises.rmdir(filePath);
+						} else {
+							throw unlinkError;
+						}
+					} else {
+						throw unlinkError;
+					}
+				}
 			}
 		} catch (error) {
 			throw this.toFileSystemProviderError(error);

src/vs/platform/files/test/node/diskFileService.integrationTest.ts

@@ -489,23 +489,27 @@ flakySuite('Disk File Service', function () {
 		assert.ok(result.ctime! > 0);
 	});
 
-	test('deleteFile', async () => {
-		return testDeleteFile(false);
+	test('deleteFile (non recursive)', async () => {
+		return testDeleteFile(false, false);
+	});
+
+	test('deleteFile (recursive)', async () => {
+		return testDeleteFile(false, true);
 	});
 
 	(isLinux /* trash is unreliable on Linux */ ? test.skip : test)('deleteFile (useTrash)', async () => {
-		return testDeleteFile(true);
+		return testDeleteFile(true, false);
 	});
 
-	async function testDeleteFile(useTrash: boolean): Promise<void> {
+	async function testDeleteFile(useTrash: boolean, recursive: boolean): Promise<void> {
 		let event: FileOperationEvent;
 		disposables.add(service.onDidRunOperation(e => event = e));
 
 		const resource = URI.file(join(testDir, 'deep', 'conway.js'));
 		const source = await service.resolve(resource);
 
-		assert.strictEqual(await service.canDelete(source.resource, { useTrash }), true);
-		await service.del(source.resource, { useTrash });
+		assert.strictEqual(await service.canDelete(source.resource, { useTrash, recursive }), true);
+		await service.del(source.resource, { useTrash, recursive });
 
 		assert.strictEqual(existsSync(source.resource.fsPath), false);
 
@@ -515,7 +519,7 @@ flakySuite('Disk File Service', function () {
 
 		let error: Error | undefined = undefined;
 		try {
-			await service.del(source.resource, { useTrash });
+			await service.del(source.resource, { useTrash, recursive });
 		} catch (e) {
 			error = e;
 		}
@@ -604,6 +608,22 @@ flakySuite('Disk File Service', function () {
 		assert.ok(error);
 	});
 
+	test('deleteFolder empty folder (recursive)', () => {
+		return testDeleteEmptyFolder(true);
+	});
+
+	test('deleteFolder empty folder (non recursive)', () => {
+		return testDeleteEmptyFolder(false);
+	});
+
+	async function testDeleteEmptyFolder(recursive: boolean): Promise<void> {
+		const { resource } = await service.createFolder(URI.file(join(testDir, 'deep', 'empty')));
+
+		await service.del(resource, { recursive });
+
+		assert.strictEqual(await service.exists(resource), false);
+	}
+
 	test('move', async () => {
 		let event: FileOperationEvent;
 		disposables.add(service.onDidRunOperation(e => event = e));