Merge pull request microsoft#3233 from Microsoft/tsconfigBug

paulvanbrenk · paulvanbrenk · commit c3a93909351a · 2015-05-20T12:26:07.000-07:00
Fix issue in the parsing of tsConfig file and fix errors in a couple of test cases when we switched to isolatedModules from separateCompilation.
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -893,7 +893,7 @@ module ts {
                     return {
                         options: configFile.options,
                         files: configFile.fileNames,
-                        errors: [realizeDiagnostics(configFile.errors, '\r\n')]
+                        errors: realizeDiagnostics(configFile.errors, '\r\n')
                     };
                 });
         }
diff --git a/tests/cases/compiler/systemModuleAmbientDeclarations.ts b/tests/cases/compiler/systemModuleAmbientDeclarations.ts
@@ -1,5 +1,5 @@
 // @module: system
-// @separateCompilation: true
+// @isolatedModules: true
 
 // @filename: file1.ts
 declare class Promise { }
diff --git a/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts b/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts
@@ -1,5 +1,5 @@
 // @module: system
-// @separateCompilation: true
+// @isolatedModules: true
 
 declare function use(a: any);
 const enum TopLevelConstEnum { X }
diff --git a/tests/cases/compiler/systemModuleDeclarationMerging.ts b/tests/cases/compiler/systemModuleDeclarationMerging.ts
@@ -1,5 +1,5 @@
 // @module: system
-// @separateCompilation: true
+// @isolatedModules: true
 
 export function F() {}
 export module F { var x; }
diff --git a/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts b/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts
@@ -1,5 +1,5 @@
 // @module: system
-// @separateCompilation: true
+// @isolatedModules: true
 
 export class TopLevelClass {}
 export module TopLevelModule {var v;}

Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,7 @@ module ts {`
`893`	`893`	`return {`
`894`	`894`	`options: configFile.options,`
`895`	`895`	`files: configFile.fileNames,`
`896`		`- errors: [realizeDiagnostics(configFile.errors, '\r\n')]`
	`896`	`+ errors: realizeDiagnostics(configFile.errors, '\r\n')`
`897`	`897`	`};`
`898`	`898`	`});`
`899`	`899`	`}`