From a7a13296e6b1ecfb170f84d34ebd3fa456cdf87e Mon Sep 17 00:00:00 2001
From: Jason Ramsay <jasonra@microsoft.com>
Date: Tue, 8 Mar 2016 17:40:03 -0800
Subject: [PATCH] CR feedback

---
 src/compiler/commandLineParser.ts | 10 +++++-----
 src/services/jsTyping.ts          | 12 +++---------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 11b9576c87a..264b2339013 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -590,10 +590,10 @@ namespace ts {
                         }
                     }
                     else if (id === "include") {
-                        options.include = ConvertJsonOptionToStringArray(id, jsonTypingOptions[id], errors);
+                        options.include = convertJsonOptionToStringArray(id, jsonTypingOptions[id], errors);
                     }
                     else if (id === "exclude") {
-                        options.exclude = ConvertJsonOptionToStringArray(id, jsonTypingOptions[id], errors);
+                        options.exclude = convertJsonOptionToStringArray(id, jsonTypingOptions[id], errors);
                     }
                     else {
                         errors.push(createCompilerDiagnostic(Diagnostics.Unknown_typing_option_0, id));
@@ -636,9 +636,9 @@ namespace ts {
                         }
                     }
                     if (opt.isFilePath) {
-                       value = normalizePath(combinePaths(basePath, value));
+                        value = normalizePath(combinePaths(basePath, value));
                        if (value === "") {
-                            value = ".";
+                           value = ".";
                         }
                     }
                     options[opt.name] = value;
@@ -655,7 +655,7 @@ namespace ts {
         return { options, errors };
     }
 
-    function ConvertJsonOptionToStringArray(optionName: string, optionJson: any, errors: Diagnostic[], func?: (element: string) => string): string[] {
+    function convertJsonOptionToStringArray(optionName: string, optionJson: any, errors: Diagnostic[], func?: (element: string) => string): string[] {
         const items: string[] = [];
         let invalidOptionType = false;
         if (!isArray(optionJson)) {
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
index b3955e89148..59918ab2445 100644
--- a/src/services/jsTyping.ts
+++ b/src/services/jsTyping.ts
@@ -193,8 +193,8 @@ namespace ts.JsTyping {
                 mergeTypings(filter(cleanedTypingNames, f => hasProperty(safeList, f)));
             }
 
-            const jsxFileNames = filter(fileNames, f => scriptKindIs(f, /*LanguageServiceHost*/ undefined, ScriptKind.JSX));
-            if (jsxFileNames.length > 0) {
+            const hasJsxFile = forEach(fileNames, f => scriptKindIs(f, /*LanguageServiceHost*/ undefined, ScriptKind.JSX));
+            if (hasJsxFile) {
                 mergeTypings(["react"]);
             }
         }
@@ -214,6 +214,7 @@ namespace ts.JsTyping {
                 filter(
                     host.readDirectory(nodeModulesPath, /*extension*/ undefined, /*exclude*/ undefined, /*depth*/ 2),
                     f => ts.getBaseFileName(f) === "package.json");
+
             for (const packageJsonFile of packageJsonFiles) {
                 const packageJsonDict = tryParseJson(packageJsonFile, host);
                 if (!packageJsonDict) { continue; }
@@ -247,13 +248,6 @@ namespace ts.JsTyping {
             if (!options) {
                 return;
             }
-
-            if (options.jsx === JsxEmit.React) {
-                typingNames.push("react");
-            }
-            if (options.moduleResolution === ModuleResolutionKind.NodeJs) {
-                typingNames.push("node");
-            }
             mergeTypings(typingNames);
         }
     }