Make fs.copyFile sync

Author: rosen-vladimirov

declarations.d.ts

@@ -245,7 +245,13 @@ interface IFileSystem {
 	 */
 	writeJson(filename: string, data: any, space?: string, encoding?: string): void;
 
-	copyFile(sourceFileName: string, destinationFileName: string): IFuture<void>;
+	/**
+	 * Copies a file.
+	 * @param {string} sourceFileName The original file that has to be copied.
+	 * @param {string} destinationFileName The filepath where the file should be copied.
+	 * @returns {void}
+	 */
+	copyFile(sourceFileName: string, destinationFileName: string): void;
 
 	/**
 	 * Returns unique file name based on the passed name by checkin if it exists and adding numbers to the passed name until a non-existent file is found.

file-system.ts

@@ -207,35 +207,20 @@ export class FileSystem implements IFileSystem {
 		return this.writeFile(filename, JSON.stringify(data, null, space), encoding);
 	}
 
-	public copyFile(sourceFileName: string, destinationFileName: string): IFuture<void> {
+	public copyFile(sourceFileName: string, destinationFileName: string): void {
 		if (path.resolve(sourceFileName) === path.resolve(destinationFileName)) {
-			return Future.fromResult();
+			return;
 		}
 
-		let res = new Future<void>();
-
 		this.createDirectory(path.dirname(destinationFileName));
-		let source = this.createReadStream(sourceFileName);
-		let target = this.createWriteStream(destinationFileName);
 
-		source.on("error", (e: Error) => {
-			if (!res.isResolved()) {
-				res.throw(e);
-			}
-		});
-		target.on("finish", () => {
-			if (!res.isResolved()) {
-				res.return();
-			}
-		})
-			.on("error", (e: Error) => {
-				if (!res.isResolved()) {
-					res.throw(e);
-				}
-			});
+		shelljs.cp("-f", sourceFileName, destinationFileName);
 
-		source.pipe(target);
-		return res;
+		const err = shelljs.error();
+
+		if (err) {
+			throw new Error(err);
+		}
 	}
 
 	public createReadStream(path: string, options?: {

services/auto-completion-service.ts

@@ -111,7 +111,6 @@ export class AutoCompletionService implements IAutoCompletionService {
 		}
 	}
 
-	// TODO: Remove IFuture, reason: appendFile
 	public enableAutoCompletion(): IFuture<void> {
 		return (() => {
 			this.updateCLIShellScript().wait();

test/unit-tests/file-system.ts

@@ -213,7 +213,7 @@ describe("FileSystem", () => {
 		});
 
 		it("correctly copies file to the same directory", () => {
-			fs.copyFile(testFileName, newFileName).wait();
+			fs.copyFile(testFileName, newFileName);
 			assert.isTrue(fs.exists(newFileName), "Renamed file should exists.");
 			assert.isTrue(fs.exists(testFileName), "Original file should exist.");
 			assert.deepEqual(fs.getFsStats(testFileName).size, fs.getFsStats(testFileName).size, "Original file and copied file must have the same size.");
@@ -222,15 +222,15 @@ describe("FileSystem", () => {
 		it("copies file to non-existent directory", () => {
 			let newFileNameInSubDir = path.join(tempDir, "subDir", "newfilename");
 			assert.isFalse(fs.exists(newFileNameInSubDir));
-			fs.copyFile(testFileName, newFileNameInSubDir).wait();
+			fs.copyFile(testFileName, newFileNameInSubDir);
 			assert.isTrue(fs.exists(newFileNameInSubDir), "Renamed file should exists.");
 			assert.isTrue(fs.exists(testFileName), "Original file should exist.");
 			assert.deepEqual(fs.getFsStats(testFileName).size, fs.getFsStats(testFileName).size, "Original file and copied file must have the same size.");
 		});
 
 		it("produces correct file when source and target file are the same", () => {
 			let originalSize = fs.getFsStats(testFileName).size;
-			fs.copyFile(testFileName, testFileName).wait();
+			fs.copyFile(testFileName, testFileName);
 			assert.isTrue(fs.exists(testFileName), "Original file should exist.");
 			assert.deepEqual(fs.getFsStats(testFileName).size, originalSize, "Original file and copied file must have the same size.");
 			assert.deepEqual(fs.readText(testFileName), fileContent, "File content should not be changed.");