openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-19 16:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: fixed static variable

Browse Source 
Signed-off-by: laibo102 <laibo2@huawei.com>
Change-Id: I14f6bf82cae9e45ed8f500c1120b5ee31ec68f27
This commit is contained in:
laibo102
2022-08-03 16:12:16 +08:00
parent 0a19a6c920
commit 58dcd99da8
1 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/process_component_class.ts
+46 -25
View File
@@ -57,7 +57,8 @@ import {
COMPONENT_CONSTRUCTOR_UNDEFINED,
CUSTOM_COMPONENT,
COMPONENT_CONSTRUCTOR_PARENT,
COMPONENT_IF_UNDEFINED
COMPONENT_IF_UNDEFINED,
INNER_COMPONENT_MEMBER_DECORATORS
} from './pre_define';
import {
BUILDIN_STYLE_NAMES,
@@ -137,31 +138,36 @@ function processMembers(members: ts.NodeArray<ts.ClassElement>, parentComponentN
members.forEach((item: ts.ClassElement) => {
let updateItem: ts.ClassElement;
if (ts.isPropertyDeclaration(item)) {
addPropertyMember(item, newMembers, program, parentComponentName.getText());
const result: UpdateResult = processMemberVariableDecorators(parentComponentName, item,
ctorNode, watchMap, checkController, log, program, context, hasPreview, interfaceNode);
if (result.isItemUpdate()) {
updateItem = result.getProperity();
if (/\bstatic\b/.test(item.getText())) {
newMembers.push(item);
validateDecorators(item, log);
} else {
updateItem = item;
}
if (result.getVariableGet()) {
newMembers.push(result.getVariableGet());
}
if (result.getVariableSet()) {
newMembers.push(result.getVariableSet());
}
if (result.isCtorUpdate()) {
ctorNode = result.getCtor();
}
if (result.getUpdateParams()) {
updateParamsStatements.push(result.getUpdateParams());
}
if (result.isDeleteParams()) {
deleteParamsStatements.push(item);
}
if (result.getControllerSet()) {
newMembers.push(result.getControllerSet());
addPropertyMember(item, newMembers, program, parentComponentName.getText());
const result: UpdateResult = processMemberVariableDecorators(parentComponentName, item,
ctorNode, watchMap, checkController, log, program, context, hasPreview, interfaceNode);
if (result.isItemUpdate()) {
updateItem = result.getProperity();
} else {
updateItem = item;
}
if (result.getVariableGet()) {
newMembers.push(result.getVariableGet());
}
if (result.getVariableSet()) {
newMembers.push(result.getVariableSet());
}
if (result.isCtorUpdate()) {
ctorNode = result.getCtor();
}
if (result.getUpdateParams()) {
updateParamsStatements.push(result.getUpdateParams());
}
if (result.isDeleteParams()) {
deleteParamsStatements.push(item);
}
if (result.getControllerSet()) {
newMembers.push(result.getControllerSet());
}
}
}
if (ts.isMethodDeclaration(item) && item.name) {
@@ -181,6 +187,21 @@ function processMembers(members: ts.NodeArray<ts.ClassElement>, parentComponentN
return newMembers;
}
function validateDecorators(item: ts.ClassElement, log: LogInfo[]): void {
if (item.decorators && item.decorators.length) {
item.decorators.map((decorator) => {
const decoratorName: string = decorator.getText();
if (INNER_COMPONENT_MEMBER_DECORATORS.has(decoratorName)) {
log.push({
type: LogType.ERROR,
message: `The static variable of struct cannot be used together with built-in decorators.`,
pos: item.getStart()
});
}
});
}
}
function addPropertyMember(item: ts.ClassElement, newMembers: ts.ClassElement[],
program: ts.Program, parentComponentName: string): void {
const propertyItem: ts.PropertyDeclaration = item as ts.PropertyDeclaration;