add prefixes for getCanonicalName

vladima · vladima · commit e9cd8a0e884d · 2014-07-14T14:44:56.000-07:00
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -556,7 +556,7 @@ module Harness {
                 },
                 getDefaultLibFilename: () => 'lib.d.ts',
                 writeFile: writeFile,
-                getCanonicalFileName: getCanonicalFileName,
+                getCanonicalFileName: ts.getCanonicalFileName,
                 useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames
             }
         }
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -222,7 +222,7 @@ class ProjectRunner extends RunnerBase {
                     getDefaultLibFilename: () => "lib.d.ts",
                     writeFile: writeFile,
                     getCurrentDirectory: getCurrentDirectory,
-                    getCanonicalFileName: getCanonicalFileName,
+                    getCanonicalFileName: ts.getCanonicalFileName,
                     useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames
                 };
             }
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
@@ -111,7 +111,7 @@ module RWC {
                         },
                         getDefaultLibFilename: () => libPath,
                         writeFile: (fn, contents) => emitterIOHost.writeFile(fn, contents, false),
-                        getCanonicalFileName: getCanonicalFileName,
+                        getCanonicalFileName: ts.getCanonicalFileName,
                         useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames
                     };
 
diff --git a/tests/webhost/webtsc.ts b/tests/webhost/webtsc.ts
@@ -1,4 +1,4 @@
-/// <reference path='..\..\src\compiler\prototype\tc.ts'/>
+/// <reference path='..\..\src\compiler\tc.ts'/>
 
 module TypeScript.WebTsc {
 
@@ -31,10 +31,11 @@ module TypeScript.WebTsc {
                 }
                 return s;
             },
-            writeFile(fileName: string, data: string): void {
+            writeFile(fileName: string, data: string): boolean {
                 var f = fso.CreateTextFile(fileName, true);
                 f.Write(data);
                 f.Close();
+                return true;
             },
             resolvePath(path: string): string {
                 return fso.GetAbsolutePathName(path);

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ module Harness {`
`556`	`556`	`},`
`557`	`557`	`getDefaultLibFilename: () => 'lib.d.ts',`
`558`	`558`	`writeFile: writeFile,`
`559`		`- getCanonicalFileName: getCanonicalFileName,`
	`559`	`+ getCanonicalFileName: ts.getCanonicalFileName,`
`560`	`560`	`useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames`
`561`	`561`	`}`
`562`	`562`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ class ProjectRunner extends RunnerBase {`
`222`	`222`	`getDefaultLibFilename: () => "lib.d.ts",`
`223`	`223`	`writeFile: writeFile,`
`224`	`224`	`getCurrentDirectory: getCurrentDirectory,`
`225`		`- getCanonicalFileName: getCanonicalFileName,`
	`225`	`+ getCanonicalFileName: ts.getCanonicalFileName,`
`226`	`226`	`useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames`
`227`	`227`	`};`
`228`	`228`	`}`