From 0ee2dbf8cf16a0f2df63eb10c4e45c60c54be3d7 Mon Sep 17 00:00:00 2001 From: "evgeniy.generalov" Date: Tue, 2 Sep 2025 18:25:06 +0300 Subject: [PATCH 1/2] Fix lang enum --- incremental/tools/panda/patch/language-enum.patch | 10 +++++----- .../src/arkts-api/node-utilities/ClassDefinition.ts | 4 ++-- .../libarkts/src/arkts-api/node-utilities/ETSModule.ts | 2 +- .../src/arkts-api/node-utilities/ScriptFunction.ts | 2 +- .../arkts-api/node-utilities/TSInterfaceDeclaration.ts | 2 +- ui2abc/libarkts/src/arkts-api/visitor.ts | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/incremental/tools/panda/patch/language-enum.patch b/incremental/tools/panda/patch/language-enum.patch index 859112338..8f6fd1120 100644 --- a/incremental/tools/panda/patch/language-enum.patch +++ b/incremental/tools/panda/patch/language-enum.patch @@ -5,11 +5,11 @@ }; +dictionary Es2pandaLanguage { -+ i32 AS = 0; -+ i32 JS = 1; -+ i32 TS = 2; -+ i32 ETS = 3; -+ i32 COUNT = 4; ++ i32 LANGUAGE_AS = 0; ++ i32 LANGUAGE_JS = 1; ++ i32 LANGUAGE_TS = 2; ++ i32 LANGUAGE_ETS = 3; ++ i32 LANGUAGE_COUNT = 4; +}; + interface es2panda_SuggestionInfo { diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts index 4df309067..cf10bfc56 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/ClassDefinition.ts @@ -41,7 +41,7 @@ export function createClassDefinition( body: readonly AstNode[], modifiers: Es2pandaClassDefinitionModifiers, flags: Es2pandaModifierFlags, annotations?: readonly AnnotationUsage[]): ClassDefinition { - return ClassDefinition.create3ClassDefinition(ident, typeParams, superTypeParams, _implements, ctor, superClass, body, modifiers, flags, Es2pandaLanguage.ETS, annotations) + return ClassDefinition.create3ClassDefinition(ident, typeParams, superTypeParams, _implements, ctor, superClass, body, modifiers, flags, Es2pandaLanguage.LANGUAGE_ETS, annotations) } export function updateClassDefinition( @@ -81,7 +81,7 @@ export function updateClassDefinition( body, modifiers, flags, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, annotations, ) } diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts index 2cf87d0a9..a6e20d281 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/ETSModule.ts @@ -37,7 +37,7 @@ export function updateETSModule( statementList, ident, flag, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, program, ), original, diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts index ac30c6bd4..e6f08ab31 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/ScriptFunction.ts @@ -51,7 +51,7 @@ export function createScriptFunction( ), datafuncFlags, dataflags, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, ident, annotations, ) diff --git a/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts b/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts index de38f28ba..1b63b1d0a 100644 --- a/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts +++ b/ui2abc/libarkts/src/arkts-api/node-utilities/TSInterfaceDeclaration.ts @@ -35,7 +35,7 @@ export function createTSInterfaceDeclaration( body, isStatic, isExternal, - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, modifierFlags, ) } diff --git a/ui2abc/libarkts/src/arkts-api/visitor.ts b/ui2abc/libarkts/src/arkts-api/visitor.ts index 0f8fb5638..b850b4b7e 100644 --- a/ui2abc/libarkts/src/arkts-api/visitor.ts +++ b/ui2abc/libarkts/src/arkts-api/visitor.ts @@ -180,7 +180,7 @@ function visitETSModule(node: ETSModule, visitor: Visitor) { newStatements, newIdent, node.getNamespaceFlag(), - Es2pandaLanguage.ETS, + Es2pandaLanguage.LANGUAGE_ETS, node.program, ) result.onUpdate(node) -- Gitee From f18ee3f427a59fa451f34a0439464176b5ae0936 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 3 Sep 2025 10:32:38 +0300 Subject: [PATCH 2/2] Update Signed-off-by: Nikolay Igotti --- ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts b/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts index 98d53ab16..f7d35970a 100644 --- a/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts +++ b/ui2abc/arkui-plugins/ui-plugins/interop/legacy-transformer.ts @@ -153,7 +153,7 @@ export class LegacyTransformer extends AbstractVisitor { [...definition.body, instantiate_Interop], definition.modifiers, arkts.Es2pandaModifierFlags.MODIFIER_FLAGS_NONE, - arkts.Es2pandaLanguage.JS + arkts.Es2pandaLanguage.LANGUAGE_JS ); if (arkts.isETSStructDeclaration(node)) { -- Gitee