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

!1102 修复@Entry和export不能同时使用问题

Browse Source 
Merge pull request !1102 from laibo102/master
This commit is contained in:
openharmony_ci
2022-09-09 01:43:59 +00:00
committed by Gitee
parent d29c978e58 cbb9fd9a86
commit 1f8394199a
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/validate_ui_syntax.ts
+19 -2
View File
@@ -177,7 +177,7 @@ function checkComponentDecorator(source: string, filePath: string,
if (ts.isStructDeclaration(item)) {
if (item.name && ts.isIdentifier(item.name)) {
if (item.decorators && item.decorators.length) {
checkDecorators(item.decorators, result, item.name, log, sourceFile);
checkDecorators(item.decorators, result, item.name, log, sourceFile, item);
} else {
const message: string = `A struct should use decorator '@Component'.`;
addLog(LogType.WARN, message, item.getStart(), log, sourceFile);
@@ -260,7 +260,7 @@ interface DecoratorResult {
}
function checkDecorators(decorators: ts.NodeArray<ts.Decorator>, result: DecoratorResult,
component: ts.Identifier, log: LogInfo[], sourceFile: ts.SourceFile): void {
component: ts.Identifier, log: LogInfo[], sourceFile: ts.SourceFile, node: ts.StructDeclaration): void {
let hasComponentDecorator: boolean = false;
const componentName: string = component.getText();
decorators.forEach((element) => {
@@ -269,6 +269,7 @@ function checkDecorators(decorators: ts.NodeArray<ts.Decorator>, result: Decorat
componentCollection.customComponents.add(componentName);
switch (name) {
case COMPONENT_DECORATOR_ENTRY:
checkEntryComponent(node, log);
result.entryCount++;
componentCollection.entryComponent = componentName;
collectLocalStorageName(element);
@@ -1074,3 +1075,19 @@ export function resetComponentCollection() {
componentCollection.entryComponentPos = null;
componentCollection.previewComponent = new Set([]);
}
function checkEntryComponent(node: ts.StructDeclaration, log: LogInfo[]): void {
if (node.modifiers) {
for (let i = 0; i < node.modifiers.length; i++) {
if (node.modifiers[i].kind === ts.SyntaxKind.ExportKeyword) {
log.push({
type: LogType.WARN,
message: `It's not a recommended way to export struct with @Entry decorator, ` +
`which may cause ACE Engine error in component preview mode.`,
pos: node.getStart()
});
break;
}
}
}
}