Merge pull request #13138 from Microsoft/mergeMaster1222

Merge master 12/22
microsoft · Dec 22, 2016 · 5f720c2 · 5f720c2
2 parents 2cf9979 + 50288d9
commit 5f720c2
Showing 1 changed file with 3 additions and 1 deletion.
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) {