Take pr feedback into account

sheetalkamat · sheetalkamat · commit 62d4fd6d35ef · 2015-10-30T15:06:23.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -740,10 +740,10 @@ namespace ts {
      */
     export const supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"];
     export const supportedJavascriptExtensions = [".js", ".jsx"];
-    export const supportedExtensionsWhenAllowedJs = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions);
+    const allSupportedExtensions  = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions);
 
     export function getSupportedExtensions(options?: CompilerOptions): string[] {
-        return options && options.allowJs ? supportedExtensionsWhenAllowedJs : supportedTypeScriptExtensions;
+        return options && options.allowJs ? allSupportedExtensions : supportedTypeScriptExtensions;
     }
 
     export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions) {
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -832,13 +832,11 @@ namespace ts {
             });
         }
 
-        function getOptionsDiagnostics(cancellationToken?: CancellationToken, includeEmitBlockingDiagnostics?: boolean): Diagnostic[] {
+        function getOptionsDiagnostics(cancellationToken?: CancellationToken): Diagnostic[] {
             let allDiagnostics: Diagnostic[] = [];
             addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
             addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics());
-            if (!includeEmitBlockingDiagnostics) {
-                addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics());
-            }
+            addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics());
             return sortAndDeduplicateDiagnostics(allDiagnostics);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -832,13 +832,11 @@ namespace ts {`
`832`	`832`	`});`
`833`	`833`	`}`
`834`	`834`
`835`		`- function getOptionsDiagnostics(cancellationToken?: CancellationToken, includeEmitBlockingDiagnostics?: boolean): Diagnostic[] {`
	`835`	`+ function getOptionsDiagnostics(cancellationToken?: CancellationToken): Diagnostic[] {`
`836`	`836`	`let allDiagnostics: Diagnostic[] = [];`
`837`	`837`	`addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());`
`838`	`838`	`addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics());`
`839`		`- if (!includeEmitBlockingDiagnostics) {`
`840`		`- addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics());`
`841`		`- }`
	`839`	`+ addRange(allDiagnostics, emitBlockingDiagnostics.getGlobalDiagnostics());`
`842`	`840`	`return sortAndDeduplicateDiagnostics(allDiagnostics);`
`843`	`841`	`}`
`844`	`842`