From 9a43ebd22539a86dcc77d9a0c854edaafcc76431 Mon Sep 17 00:00:00 2001
From: bojiang <jiangbo91@huawei.com>
Date: Fri, 22 Jul 2022 11:00:08 +0800
Subject: [PATCH] jiangbo91@huawei.com
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

代码规划

Signed-off-by: bojiang <jiangbo91@huawei.com>
Change-Id: I4df05be6720d7f5a0f1492cd6c5e576ade97bb4e
---
 compiler/src/ets_checker.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/compiler/src/ets_checker.ts b/compiler/src/ets_checker.ts
index f0112d6..1c4ea0f 100644
--- a/compiler/src/ets_checker.ts
+++ b/compiler/src/ets_checker.ts
@@ -17,9 +17,9 @@ import fs from 'fs';
 import path from 'path';
 import * as ts from 'typescript';
 
-import { 
+import {
   projectConfig,
-  systemModules 
+  systemModules
 } from '../main';
 import {
   processSystemApi,
@@ -292,7 +292,7 @@ function traverseBuild(node: ts.Node, index: number): void {
       parentComponentName = node.parent.statements[index - 1].expression.expression.escapedText;
     }
     node = node.expression;
-    if (ts.isEtsComponentExpression(node) && node.body && ts.isBlock(node.body) && 
+    if (ts.isEtsComponentExpression(node) && node.body && ts.isBlock(node.body) &&
       !$$_BLOCK_INTERFACE.has(node.expression.escapedText.toString())) {
       node.body.statements.forEach((item, indexBlock) => {
         traverseBuild(item, indexBlock);
@@ -316,11 +316,12 @@ function traverseBuild(node: ts.Node, index: number): void {
 
 function isPropertiesAddDoubleDollar(node: ts.Node): boolean {
   if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.arguments && node.arguments.length) {
-    return true; 
-  }
-  if(ts.isEtsComponentExpression(node) && node.body && ts.isBlock(node.body) &&
-  $$_BLOCK_INTERFACE.has(node.expression.escapedText.toString())) {
     return true;
+  } else if (ts.isEtsComponentExpression(node) && node.body && ts.isBlock(node.body) &&
+    $$_BLOCK_INTERFACE.has(node.expression.escapedText.toString())) {
+    return true;
+  } else {
+    return false;
   }
 }
 function loopNodeFindDoubleDollar(node: ts.Node, parentComponentName: string): void {
@@ -333,7 +334,7 @@ function loopNodeFindDoubleDollar(node: ts.Node, parentComponentName: string): v
           doubleDollarCollection(item);
         });
       }
-    } else if (Boolean(isPropertiesAddDoubleDollar(node))) {
+    } else if (isPropertiesAddDoubleDollar(node)) {
       node.arguments.forEach((item: ts.Node) => {
         if (ts.isObjectLiteralExpression(item) && item.properties && item.properties.length) {
           item.properties.forEach((param: ts.Node) => {