Emit "declare" for temp default var name only if declaration file emit context allows

sheetalkamat · sheetalkamat · commit 592a4b9fb361 · 2016-04-04T13:35:42.000-07:00
Fixes microsoft#7807
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -530,7 +530,10 @@ namespace ts {
             else {
                 // Expression
                 const tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
@@ -17,22 +17,6 @@ System.register("pi", [], function(exports_1, context_1) {
 
 //// [app.d.ts]
 declare module "pi" {
-    declare var _default: number;
+    var _default: number;
     export default _default;
 }
-
-
-//// [DtsFileErrors]
-
-
-app.d.ts(2,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
-
-
-==== app.d.ts (1 errors) ====
-    declare module "pi" {
-        declare var _default: number;
-        ~~~~~~~
-!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context.
-        export default _default;
-    }
-    
