Merge pull request #13138 from Microsoft/mergeMaster1222

mhegazy · web-flow · commit 5f720c2d569e · 2016-12-22T15:54:33.000-08:00
Merge master 12/22
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -818,7 +818,9 @@ namespace ts {
                     if (resolved) {
                         return resolved;
                     }
-                    trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
+                    if (state.traceEnabled) {
+                        trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);
+                    }
                 }
                 const resolved = tryAddingExtensions(mainOrTypesFile, Extensions.TypeScript, failedLookupLocations, onlyRecordFailures, state);
                 if (resolved) {

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,9 @@ namespace ts {`
`818`	`818`	`if (resolved) {`
`819`	`819`	`return resolved;`
`820`	`820`	`}`
`821`		`- trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);`
	`821`	`+ if (state.traceEnabled) {`
	`822`	`+ trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile);`
	`823`	`+ }`
`822`	`824`	`}`
`823`	`825`	`const resolved = tryAddingExtensions(mainOrTypesFile, Extensions.TypeScript, failedLookupLocations, onlyRecordFailures, state);`
`824`	`826`	`if (resolved) {`