Merge branch 'master' into publicTransformers

src/compiler/factory.ts

@@ -286,7 +286,7 @@ namespace ts {
         return node;
     }
 
-    export function updateMethod(node: MethodDeclaration, decorators: Decorator[] | undefined, modifiers: Modifier[] | undefined, name: PropertyName, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) {
+    export function updateMethod(node: MethodDeclaration, decorators: Decorator[] | undefined, modifiers: Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: PropertyName, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) {
         return node.decorators !== decorators
             || node.modifiers !== modifiers
             || node.asteriskToken !== asteriskToken
@@ -555,7 +555,7 @@ namespace ts {
         return node;
     }
 
-    export function updateFunctionExpression(node: FunctionExpression, modifiers: Modifier[] | undefined, name: Identifier | undefined, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], type: TypeNode | undefined, body: Block) {
+    export function updateFunctionExpression(node: FunctionExpression, modifiers: Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], type: TypeNode | undefined, body: Block) {
         return node.name !== name
             || node.modifiers !== modifiers
             || node.asteriskToken !== asteriskToken
@@ -1112,7 +1112,7 @@ namespace ts {
         return node;
     }
 
-    export function updateFunctionDeclaration(node: FunctionDeclaration, decorators: Decorator[] | undefined, modifiers: Modifier[] | undefined, name: Identifier | undefined, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) {
+    export function updateFunctionDeclaration(node: FunctionDeclaration, decorators: Decorator[] | undefined, modifiers: Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) {
         return node.decorators !== decorators
             || node.modifiers !== modifiers
             || node.asteriskToken !== asteriskToken

src/compiler/transformers/esnext.ts

@@ -128,6 +128,7 @@ namespace ts {
                 const expression = visitNode(node.expression, visitor, isExpression);
                 return updateYield(
                     node,
+                    node.asteriskToken,
                     node.asteriskToken
                         ? createAsyncDelegatorHelper(context, expression, expression)
                         : createArrayLiteral(

src/compiler/visitor.ts

@@ -267,6 +267,7 @@ namespace ts {
                 return updateMethod(<MethodDeclaration>node,
                     visitNodes((<MethodDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<MethodDeclaration>node).modifiers, visitor, isModifier),
+                    (<MethodDeclaration>node).asteriskToken,
                     visitNode((<MethodDeclaration>node).name, visitor, isPropertyName),
                     visitNodes((<MethodDeclaration>node).typeParameters, visitor, isTypeParameter),
                     visitParameterList((<MethodDeclaration>node).parameters, visitor, context),
@@ -361,6 +362,7 @@ namespace ts {
             case SyntaxKind.FunctionExpression:
                 return updateFunctionExpression(<FunctionExpression>node,
                     visitNodes((<FunctionExpression>node).modifiers, visitor, isModifier),
+                    (<FunctionExpression>node).asteriskToken,
                     visitNode((<FunctionExpression>node).name, visitor, isIdentifier),
                     visitNodes((<FunctionExpression>node).typeParameters, visitor, isTypeParameter),
                     visitParameterList((<FunctionExpression>node).parameters, visitor, context),
@@ -497,6 +499,7 @@ namespace ts {
 
             case SyntaxKind.ForOfStatement:
                 return updateForOf(<ForOfStatement>node,
+                    (<ForOfStatement>node).awaitModifier,
                     visitNode((<ForOfStatement>node).initializer, visitor, isForInitializer),
                     visitNode((<ForOfStatement>node).expression, visitor, isExpression),
                     visitNode((<ForOfStatement>node).statement, visitor, isStatement, liftToBlock));
@@ -552,6 +555,7 @@ namespace ts {
                 return updateFunctionDeclaration(<FunctionDeclaration>node,
                     visitNodes((<FunctionDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<FunctionDeclaration>node).modifiers, visitor, isModifier),
+                    (<FunctionDeclaration>node).asteriskToken,
                     visitNode((<FunctionDeclaration>node).name, visitor, isIdentifier),
                     visitNodes((<FunctionDeclaration>node).typeParameters, visitor, isTypeParameter),
                     visitParameterList((<FunctionDeclaration>node).parameters, visitor, context),
@@ -1271,43 +1275,6 @@ namespace ts {
             : addRange(statements, declarations);
     }
 
-    /**
-     * Merges generated lexical declarations into the FunctionBody of a non-arrow function-like declaration.
-     *
-     * @param node The ConciseBody of an arrow function.
-     * @param declarations The lexical declarations to merge.
-     */
-    export function mergeFunctionBodyLexicalEnvironment(body: FunctionBody, declarations: Statement[]): FunctionBody;
-
-    /**
-     * Merges generated lexical declarations into the ConciseBody of an ArrowFunction.
-     *
-     * @param node The ConciseBody of an arrow function.
-     * @param declarations The lexical declarations to merge.
-     */
-    export function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody;
-
-    export function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody {
-        if (body && declarations !== undefined && declarations.length > 0) {
-            if (isBlock(body)) {
-                return updateBlock(body, setTextRange(createNodeArray(concatenate(body.statements, declarations)), body.statements));
-            }
-            else {
-                return setTextRange(
-                    createBlock(
-                        setTextRange(
-                            createNodeArray([setTextRange(createReturn(body), body), ...declarations]),
-                            body
-                        ),
-                        /*multiLine*/ true
-                    ),
-                    /*location*/ body
-                );
-            }
-        }
-        return body;
-    }
-
     /**
      * Lifts a NodeArray containing only Statement nodes to a block.
      *