Only trace if traceEnabled

Andy Hanson · Andy Hanson · commit e9f95e2296e6 · 2017-04-10T09:06:26.000-07:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -954,17 +954,19 @@ namespace ts {
                 }
                 nodeModulesAtTypesExists = false;
             }
-            return loadModuleFromNodeModulesFolder(Extensions.DtsOnly, mangleScopedPackage(moduleName, state.host), nodeModulesAtTypes, nodeModulesAtTypesExists, failedLookupLocations, state);
+            return loadModuleFromNodeModulesFolder(Extensions.DtsOnly, mangleScopedPackage(moduleName, state), nodeModulesAtTypes, nodeModulesAtTypesExists, failedLookupLocations, state);
         }
     }
 
     /** For a scoped package, we must look in `@types/foo__bar` instead of `@types/@foo/bar`. */
-    function mangleScopedPackage(moduleName: string, host: ModuleResolutionHost): string {
+    function mangleScopedPackage(moduleName: string, state: ModuleResolutionState): string {
         if (startsWith(moduleName, "@")) {
             const replaceSlash = moduleName.replace(ts.directorySeparator, "__");
             if (replaceSlash !== moduleName) {
                 const mangled = replaceSlash.slice(1); // Take off the "@"
-                trace(host, Diagnostics.Scoped_package_detected_looking_in_0, mangled);
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.Scoped_package_detected_looking_in_0, mangled);
+                }
                 return mangled;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -954,17 +954,19 @@ namespace ts {`
`954`	`954`	`}`
`955`	`955`	`nodeModulesAtTypesExists = false;`
`956`	`956`	`}`
`957`		`- return loadModuleFromNodeModulesFolder(Extensions.DtsOnly, mangleScopedPackage(moduleName, state.host), nodeModulesAtTypes, nodeModulesAtTypesExists, failedLookupLocations, state);`
	`957`	`+ return loadModuleFromNodeModulesFolder(Extensions.DtsOnly, mangleScopedPackage(moduleName, state), nodeModulesAtTypes, nodeModulesAtTypesExists, failedLookupLocations, state);`
`958`	`958`	`}`
`959`	`959`	`}`
`960`	`960`
`961`	`961`	/** For a scoped package, we must look in `@types/foo__bar` instead of `@types/@foo/bar`. */
`962`		`- function mangleScopedPackage(moduleName: string, host: ModuleResolutionHost): string {`
	`962`	`+ function mangleScopedPackage(moduleName: string, state: ModuleResolutionState): string {`
`963`	`963`	`if (startsWith(moduleName, "@")) {`
`964`	`964`	`const replaceSlash = moduleName.replace(ts.directorySeparator, "__");`
`965`	`965`	`if (replaceSlash !== moduleName) {`
`966`	`966`	`const mangled = replaceSlash.slice(1); // Take off the "@"`
`967`		`- trace(host, Diagnostics.Scoped_package_detected_looking_in_0, mangled);`
	`967`	`+ if (state.traceEnabled) {`
	`968`	`+ trace(state.host, Diagnostics.Scoped_package_detected_looking_in_0, mangled);`
	`969`	`+ }`
`968`	`970`	`return mangled;`
`969`	`971`	`}`
`970`	`972`	`}`