From f3f5993770078c42830a068092484b621e8ea9ef Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 16 Jul 2014 11:46:25 -0700
Subject: [PATCH] Incorporating code review feedback.

---
 src/compiler/sys.ts           | 4 ++--
 src/compiler/tc.ts            | 2 +-
 src/harness/projectsRunner.ts | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 1ac5b3bcde1..5215617d5f1 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -30,10 +30,10 @@ var sys: System = (function () {
         var fso = new ActiveXObject("Scripting.FileSystemObject");
 
         var fileStream = new ActiveXObject("ADODB.Stream");
-        fileStream.Type = 2;
+        fileStream.Type = 2 /*text*/;
 
         var binaryStream = new ActiveXObject("ADODB.Stream");
-        binaryStream.Type = 1;
+        binaryStream.Type = 1 /*binary*/;
 
         var args: string[] = [];
         for (var i = 0; i < WScript.Arguments.length; i++) {
diff --git a/src/compiler/tc.ts b/src/compiler/tc.ts
index d683dd8dab4..f5958d118f1 100644
--- a/src/compiler/tc.ts
+++ b/src/compiler/tc.ts
@@ -162,7 +162,7 @@ module ts {
             getSourceFile: getSourceFile,
             getDefaultLibFilename: () => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), "lib.d.ts"),
             writeFile: writeFile,
-            getCurrentDirectory: () => currentDirectory || sys.getCurrentDirectory(),
+            getCurrentDirectory: () => currentDirectory || (currentDirectory = sys.getCurrentDirectory()),
             useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
             getCanonicalFileName: getCanonicalFileName
         };
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
index 3335bf512d9..a3e86195cbf 100644
--- a/src/harness/projectsRunner.ts
+++ b/src/harness/projectsRunner.ts
@@ -232,7 +232,9 @@ class ProjectRunner extends RunnerBase {
             if (!errors.length) {
                 var checker = program.getTypeChecker();
                 errors = checker.getDiagnostics();
-                sourceMapData = checker.emitFiles().sourceMaps;
+                var emitResult = checker.emitFiles();
+                errors = ts.concatenate(errors, emitResult.errors);
+                sourceMapData = emitResult.sourceMaps;
 
                 // Clean up source map data that will be used in baselining
                 if (sourceMapData) {