Merge branch 'master' into indentSimplification

Author: CyrusNajmabadi

src/harness/compilerRunner.ts

@@ -152,7 +152,6 @@ class CompilerBaselineRunner extends RunnerBase {
                 if (this.errors) {
                     Harness.Baseline.runBaseline('Correct errors for ' + fileName, justName.replace(/\.ts$/, '.errors.txt'), (): string => {
                         if (result.errors.length === 0) return null;
-                        
                         return getErrorBaseline(toBeCompiled, otherFiles, result);
                     });
                 }

src/harness/harness.ts

@@ -835,7 +835,7 @@ module Harness {
             // Register input files
             function register(file: { unitName: string; content: string; }) {
                 if (file.content !== undefined) {
-                    var fileName = ts.normalizeSlashes(file.unitName);
+                    var fileName = ts.normalizePath(file.unitName);
                     filemap[getCanonicalFileName(fileName)] = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget);
                 }
             };
@@ -844,6 +844,7 @@ module Harness {
             return {
                 getCurrentDirectory,
                 getSourceFile: (fn, languageVersion) => {
+                    fn = ts.normalizePath(fn);
                     if (Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(fn))) {
                         return filemap[getCanonicalFileName(fn)];
                     }
@@ -1078,16 +1079,6 @@ module Harness {
                     }
                 });
 
-                var filemap: { [name: string]: ts.SourceFile; } = {};
-                var register = (file: { unitName: string; content: string; }) => {
-                    if (file.content !== undefined) {
-                        var fileName = ts.normalizeSlashes(file.unitName);
-                        filemap[getCanonicalFileName(fileName)] = createSourceFileAndAssertInvariants(fileName, file.content, options.target, assertInvariants);
-                    }
-                };
-                inputFiles.forEach(register);
-                otherFiles.forEach(register);
-
                 var fileOutputs: GeneratedFile[] = [];
 
                 var programFiles = inputFiles.map(file => file.unitName);