Fix emit issues

Author: rbuckton

Diff for: src/compiler/factory.ts

@@ -3118,6 +3118,18 @@ namespace ts {
         return node.emitNode;
     }
 
+    /**
+     * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments.
+     * @internal
+     */
+    export function removeAllComments<T extends Node>(node: T): T {
+        const emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= EmitFlags.NoComments;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+
     export function setTextRange<T extends TextRange>(range: T, location: TextRange | undefined): T {
         if (location) {
             range.pos = location.pos;

Diff for: src/compiler/transformers/classFields.ts

@@ -90,8 +90,11 @@ namespace ts {
                 case SyntaxKind.ComputedPropertyName:
                     return visitComputedPropertyName(node as ComputedPropertyName);
 
-                default:
+                case SyntaxKind.SemicolonClassElement:
                     return node;
+
+                default:
+                    return visitor(node);
             }
         }
 
@@ -138,28 +141,30 @@ namespace ts {
             if (!forEach(node.members, isPropertyDeclaration)) {
                 return visitEachChild(node, visitor, context);
             }
+
             const savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
+            pendingExpressions = undefined!;
 
             const extendsClauseElement = getEffectiveBaseTypeNode(node);
             const isDerivedClass = !!(extendsClauseElement && skipOuterExpressions(extendsClauseElement.expression).kind !== SyntaxKind.NullKeyword);
 
             const statements: Statement[] = [
                 updateClassDeclaration(
                     node,
-                    node.decorators,
+                    /*decorators*/ undefined,
                     node.modifiers,
                     node.name,
-                    node.typeParameters,
-                    node.heritageClauses,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.heritageClauses, visitor, isHeritageClause),
                     transformClassMembers(node, isDerivedClass)
                 )
             ];
 
             // Write any pending expressions from elided or moved computed property names
             if (some(pendingExpressions)) {
-                statements.push(createExpressionStatement(inlineExpressions(pendingExpressions!)));
+                statements.push(createExpressionStatement(inlineExpressions(pendingExpressions)));
             }
+
             pendingExpressions = savedPendingExpressions;
 
             // Emit static property assignment. Because classDeclaration is lexically evaluated,
@@ -199,7 +204,7 @@ namespace ts {
                 node,
                 node.modifiers,
                 node.name,
-                node.typeParameters,
+                /*typeParameters*/ undefined,
                 visitNodes(node.heritageClauses, visitor, isHeritageClause),
                 transformClassMembers(node, isDerivedClass)
             );
@@ -329,6 +334,21 @@ namespace ts {
             //      this.x = 1;
             //  }
             //
+            if (constructor && constructor.body) {
+                let parameterPropertyDeclarationCount = 0;
+                for (let i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (isParameterPropertyDeclaration(getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    addRange(statements, visitNodes(constructor.body.statements, visitor, isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
             addInitializedPropertyStatements(statements, properties, createThis());
 
             // Add existing statements, skipping the initial super call.

Diff for: src/compiler/transformers/es2015.ts

@@ -1567,7 +1567,7 @@ namespace ts {
                         break;
 
                     default:
-                        Debug.failBadSyntaxKind(node);
+                        Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }