From b72ca7169a62de1ac362b3619c8d28528a7416c9 Mon Sep 17 00:00:00 2001
From: laibo102 <laibo2@huawei.com>
Date: Tue, 1 Mar 2022 14:20:40 +0800
Subject: [PATCH] laibo2@huawei.com

Signed-off-by: laibo102 <laibo2@huawei.com>
Change-Id: Ibe0f41d61dc80662f37c8c96e7f8e2ecf1704a89
---
 compiler/src/process_component_build.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/compiler/src/process_component_build.ts b/compiler/src/process_component_build.ts
index 12582c3..d8db918 100644
--- a/compiler/src/process_component_build.ts
+++ b/compiler/src/process_component_build.ts
@@ -623,14 +623,13 @@ function processDragStartBuilder(node: ts.CallExpression): ts.CallExpression {
     for (let i = 0; i < node.arguments[0].body.statements.length; i++) {
       // @ts-ignore
       let statement: ts.Statement = node.arguments[0].body.statements[i];
-      checkStatement(statement);
-      newStatements.push(statement);
-      node = ts.factory.updateCallExpression(node, node.expression, node.typeArguments, [ts.factory.updateArrowFunction(
-        // @ts-ignore
-        node.arguments[0], undefined, undefined, node.arguments[0].parameters, node.arguments[0].type,
-        // @ts-ignore
-        node.arguments[0].equalsGreaterThanToken, ts.factory.updateBlock(node.arguments[0].body, newStatements))]);
+      newStatements.push(checkStatement(statement));
     }
+    node = ts.factory.updateCallExpression(node, node.expression, node.typeArguments, [ts.factory.updateArrowFunction(
+      // @ts-ignore
+      node.arguments[0], undefined, undefined, node.arguments[0].parameters, node.arguments[0].type,
+      // @ts-ignore
+      node.arguments[0].equalsGreaterThanToken, ts.factory.updateBlock(node.arguments[0].body, newStatements))]);
   }
   return node;
 }
@@ -640,7 +639,7 @@ function isNodeFunction(node: ts.CallExpression): boolean {
     ts.isBlock(node.arguments[0].body);
 }
 
-function checkStatement(statement: ts.Statement): void {
+function checkStatement(statement: ts.Statement): ts.Statement {
   if (ts.isReturnStatement(statement)) {
     if (ts.isObjectLiteralExpression(statement.expression)) {
       const newProperties: ts.ObjectLiteralElementLike[] = [];
@@ -649,10 +648,12 @@ function checkStatement(statement: ts.Statement): void {
         checkProperty(property);
         newProperties.push(property);
       }
-      statement = ts.factory.createReturnStatement(ts.factory.createObjectLiteralExpression(newProperties));
+      return ts.factory.createReturnStatement(ts.factory.createObjectLiteralExpression(newProperties));
     } else {
-      statement = ts.factory.updateReturnStatement(statement, parseBuilderNode(statement.expression));
+      return ts.factory.updateReturnStatement(statement, parseBuilderNode(statement.expression));
     }
+  } else {
+    return statement;
   }
 }