From 6ef27a4e1e2d7daf77c21bdd2148ee4459be1420 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Thu, 10 Aug 2017 08:28:25 -0700
Subject: [PATCH] Added test for class/namespace merging with an ESNext target.

---
 src/harness/unittests/transform.ts | 47 ++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/harness/unittests/transform.ts b/src/harness/unittests/transform.ts
index 74b92f7c5a7..dc90638afd1 100644
--- a/src/harness/unittests/transform.ts
+++ b/src/harness/unittests/transform.ts
@@ -78,28 +78,43 @@ namespace ts {
         testBaseline("synthesizedNamespace", () => {
             return ts.transpileModule(`namespace Reflect { const x = 1; }`, {
                 transformers: {
-                    before: [forceSyntheticModuleDeclaration],
+                    before: [forceNamespaceRewrite],
                 },
                 compilerOptions: {
                     newLine: NewLineKind.CarriageReturnLineFeed,
                 }
             }).outputText;
-
-            function forceSyntheticModuleDeclaration(context: ts.TransformationContext) {
-                return (sourceFile: ts.SourceFile): ts.SourceFile => {
-                    return visitNode(sourceFile);
-
-                    function visitNode<T extends ts.Node>(node: T): T {
-                        if (node.kind === ts.SyntaxKind.ModuleBlock) {
-                            const block = node as T & ts.ModuleBlock;
-                            const statements = ts.createNodeArray([...block.statements]);
-                            return ts.updateModuleBlock(block, statements) as typeof block;
-                        }
-                        return ts.visitEachChild(node, visitNode, context);
-                    }
-                };
-            }
         });
+
+        testBaseline("synthesizedNamespaceFollowingClass", () => {
+            return ts.transpileModule(`
+            class C { foo = 10; static bar = 20 }
+            namespace C { export let x = 10; }
+            `, {
+                transformers: {
+                    before: [forceNamespaceRewrite],
+                },
+                compilerOptions: {
+                    target: ts.ScriptTarget.ESNext,
+                    newLine: NewLineKind.CarriageReturnLineFeed,
+                }
+            }).outputText;
+        });
+
+        function forceNamespaceRewrite(context: ts.TransformationContext) {
+            return (sourceFile: ts.SourceFile): ts.SourceFile => {
+                return visitNode(sourceFile);
+
+                function visitNode<T extends ts.Node>(node: T): T {
+                    if (node.kind === ts.SyntaxKind.ModuleBlock) {
+                        const block = node as T & ts.ModuleBlock;
+                        const statements = ts.createNodeArray([...block.statements]);
+                        return ts.updateModuleBlock(block, statements) as typeof block;
+                    }
+                    return ts.visitEachChild(node, visitNode, context);
+                }
+            };
+        }
     });
 }