Merge pull request #5373 from brettm523/5298-normalize-err-msg-path

DanielRosenwasser · DanielRosenwasser · commit 7ed6c7a944a1 · 2015-10-22T23:54:01.000-07:00
add normalizePath to to fix slashes
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -567,7 +567,7 @@ namespace ts {
 
     function writeConfigFile(options: CompilerOptions, fileNames: string[]) {
         let currentDirectory = sys.getCurrentDirectory();
-        let file = combinePaths(currentDirectory, "tsconfig.json");
+        let file = normalizePath(combinePaths(currentDirectory, "tsconfig.json"));
         if (sys.fileExists(file)) {
             reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file));
         }

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,7 @@ namespace ts {`
`567`	`567`
`568`	`568`	`function writeConfigFile(options: CompilerOptions, fileNames: string[]) {`
`569`	`569`	`let currentDirectory = sys.getCurrentDirectory();`
`570`		`- let file = combinePaths(currentDirectory, "tsconfig.json");`
	`570`	`+ let file = normalizePath(combinePaths(currentDirectory, "tsconfig.json"));`
`571`	`571`	`if (sys.fileExists(file)) {`
`572`	`572`	`reportDiagnostic(createCompilerDiagnostic(Diagnostics.A_tsconfig_json_file_is_already_defined_at_Colon_0, file));`
`573`	`573`	`}`