From 62d4fd6d35efb9453abc638c106723ecd1efd229 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 30 Oct 2015 15:06:23 -0700
Subject: [PATCH] Take pr feedback into account

---
 src/compiler/core.ts    | 4 ++--
 src/compiler/program.ts | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 9336217558b..1b19eb5a77b 100644
--- 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
index d1e858680c5..4b0fcc934c2 100644
--- 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);
         }