addressed PR feedback

vladima · vladima · commit 076d65e1cf26 · 2015-11-16T16:23:18.000-08:00
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
@@ -250,10 +250,11 @@ class CompilerBaselineRunner extends RunnerBase {
                     // These types are equivalent, but depend on what order the compiler observed
                     // certain parts of the program.
 
-                    const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!result.program.getSourceFile(file.unitName));
+                    const program = result.program;
+                    const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName));
 
-                    const fullWalker = new TypeWriterWalker(result.program, /*fullTypeCheck*/ true);
-                    const pullWalker = new TypeWriterWalker(result.program, /*fullTypeCheck*/ false);
+                    const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true);
+                    const pullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ false);
 
                     const fullResults: ts.Map<TypeWriterResult[]> = {};
                     const pullResults: ts.Map<TypeWriterResult[]> = {};
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -767,9 +767,9 @@ namespace Harness {
 }
 
 namespace Harness {
-    const tcServicesFileName = "built/local/typescriptServices.js";
     export const libFolder = "built/local/";
-    export let tcServicesFile = IO.readFile(tcServicesFileName);
+    const tcServicesFileName = ts.combinePaths(libFolder, "typescriptServices.js");
+    export const tcServicesFile = IO.readFile(tcServicesFileName);
 
     export interface SourceMapEmitterCallback {
         (emittedFile: string, emittedLine: number, emittedColumn: number, sourceFile: string, sourceLine: number, sourceColumn: number, sourceName: string): void;
@@ -990,7 +990,6 @@ namespace Harness {
             options.noErrorTruncation = true;
             options.skipDefaultLibCheck = true;
 
-            const newLine = "\r\n";
             currentDirectory = currentDirectory || Harness.IO.getCurrentDirectory();
 
             // Parse settings
@@ -1002,27 +1001,30 @@ namespace Harness {
                 useCaseSensitiveFileNames = options.useCaseSensitiveFileNames;
             }
 
+            const programFiles: TestFile[] = inputFiles.slice();
             // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context.
             // Treat them as library files, so include them in build, but not in baselines.
-            const includeBuiltFiles: TestFile[] = [];
             if (options.includeBuiltFile) {
-                const builtFileName = libFolder + options.includeBuiltFile;
+                const builtFileName = ts.combinePaths(libFolder, options.includeBuiltFile);
                 const builtFile: TestFile = {
                     unitName: builtFileName,
-                    content: normalizeLineEndings(IO.readFile(builtFileName), newLine),
+                    content: normalizeLineEndings(IO.readFile(builtFileName), Harness.IO.newLine()),
                 };
-                includeBuiltFiles.push(builtFile);
+                programFiles.push(builtFile);
             }
 
             const fileOutputs: GeneratedFile[] = [];
 
-            const programFiles = inputFiles.concat(includeBuiltFiles).map(file => file.unitName);
+            const programFileNames = programFiles.map(file => file.unitName);
 
             const compilerHost = createCompilerHost(
-                inputFiles.concat(includeBuiltFiles).concat(otherFiles),
+                programFiles.concat(otherFiles),
                 (fileName, code, writeByteOrderMark) => fileOutputs.push({ fileName, code, writeByteOrderMark }),
-                options.target, useCaseSensitiveFileNames, currentDirectory, options.newLine);
-            const program = ts.createProgram(programFiles, options, compilerHost);
+                options.target,
+                useCaseSensitiveFileNames,
+                currentDirectory,
+                options.newLine);
+            const program = ts.createProgram(programFileNames, options, compilerHost);
 
             const emitResult = program.emit();
 
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -55,7 +55,7 @@ declare module ts {
     }    
 }
 
-declare module FourSlashInterface {
+declare namespace FourSlashInterface {
     interface Marker {
         fileName: string;
         position: number;
@@ -331,15 +331,6 @@ declare module FourSlashInterface {
         };
     }
 }
-declare module fs {
-    var test: FourSlashInterface.test_;
-    var goTo: FourSlashInterface.goTo;
-    var verify: FourSlashInterface.verify;
-    var edit: FourSlashInterface.edit;
-    var debug: FourSlashInterface.debug;
-    var format: FourSlashInterface.format;
-    var cancellation: FourSlashInterface.cancellation;
-}
 declare function verifyOperationIsCancelled(f: any): void;
 declare var test: FourSlashInterface.test_;
 declare var goTo: FourSlashInterface.goTo;

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ declare module ts {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-declare module FourSlashInterface {`
	`58`	`+declare namespace FourSlashInterface {`
`59`	`59`	`interface Marker {`
`60`	`60`	`fileName: string;`
`61`	`61`	`position: number;`
`@@ -331,15 +331,6 @@ declare module FourSlashInterface {`
`331`	`331`	`};`
`332`	`332`	`}`
`333`	`333`	`}`
`334`		`-declare module fs {`
`335`		`- var test: FourSlashInterface.test_;`
`336`		`- var goTo: FourSlashInterface.goTo;`
`337`		`- var verify: FourSlashInterface.verify;`
`338`		`- var edit: FourSlashInterface.edit;`
`339`		`- var debug: FourSlashInterface.debug;`
`340`		`- var format: FourSlashInterface.format;`
`341`		`- var cancellation: FourSlashInterface.cancellation;`
`342`		`-}`
`343`	`334`	`declare function verifyOperationIsCancelled(f: any): void;`
`344`	`335`	`declare var test: FourSlashInterface.test_;`
`345`	`336`	`declare var goTo: FourSlashInterface.goTo;`