From 32d09ee0afd35408e2cddb81244da6fbecc903a9 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Tue, 15 Jul 2025 11:38:02 +0300 Subject: [PATCH 1/2] Workaround for trailing lambda --- ui2abc/libarkts/src/arkts-api/InferVoidReturnType.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui2abc/libarkts/src/arkts-api/InferVoidReturnType.ts b/ui2abc/libarkts/src/arkts-api/InferVoidReturnType.ts index f25337500a..8125c3240b 100644 --- a/ui2abc/libarkts/src/arkts-api/InferVoidReturnType.ts +++ b/ui2abc/libarkts/src/arkts-api/InferVoidReturnType.ts @@ -69,7 +69,7 @@ class InferVoidReturnType extends AbstractVisitor { Es2pandaPrimitiveType.PRIMITIVE_TYPE_VOID, ), result.hasReceiver, - result.flags, + result.flags & (~Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_TRAILING_LAMBDA), result.modifierFlags, result.id, result.annotations, -- Gitee From 7cfa7d2450655f53c0e52d8e366ccbcc59d68a01 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 15 Jul 2025 18:46:47 +0300 Subject: [PATCH 2/2] Updated GF in linarkts Signed-off-by: Alexander Gorshenev --- .../arkts-api/recheck/lambda/unchanged/dump-src/main.ets | 6 +++--- .../arkts-api/recheck/optional/unchanged/dump-src/main.ets | 6 +++--- .../recheck/static/trailing-block/dump-src/main.ets | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui2abc/libarkts/test/arkts-api/recheck/lambda/unchanged/dump-src/main.ets b/ui2abc/libarkts/test/arkts-api/recheck/lambda/unchanged/dump-src/main.ets index 061169c18f..a0c2e545a5 100644 --- a/ui2abc/libarkts/test/arkts-api/recheck/lambda/unchanged/dump-src/main.ets +++ b/ui2abc/libarkts/test/arkts-api/recheck/lambda/unchanged/dump-src/main.ets @@ -9,13 +9,13 @@ function foo(): void { } function hasTrailing(first?: string, trailing?: (()=> void)): void { - ({let gensym%%_994 = trailing; - (((gensym%%_994) == (null)) ? undefined : gensym%%_994())}); + ({let gensym%%_942 = trailing; + (((gensym%%_942) == (null)) ? undefined : gensym%%_942())}); } function bar(zzz: string): void { hasTrailing("xxx"); - hasTrailing("xxx", (() => { + hasTrailing("xxx", ((): void => { const d = zzz; })); } diff --git a/ui2abc/libarkts/test/arkts-api/recheck/optional/unchanged/dump-src/main.ets b/ui2abc/libarkts/test/arkts-api/recheck/optional/unchanged/dump-src/main.ets index 743c451040..3f58df541d 100644 --- a/ui2abc/libarkts/test/arkts-api/recheck/optional/unchanged/dump-src/main.ets +++ b/ui2abc/libarkts/test/arkts-api/recheck/optional/unchanged/dump-src/main.ets @@ -3,9 +3,9 @@ function main(): void {} function foo(x: (X | undefined)): void { - let zzz = ({let gensym%%_860 = ({let gensym%%_859 = x; - (((gensym%%_859) == (null)) ? undefined : gensym%%_859.y)}); - (((gensym%%_860) == (null)) ? undefined : gensym%%_860.length)}); + let zzz = ({let gensym%%_806 = ({let gensym%%_805 = x; + (((gensym%%_805) == (null)) ? undefined : gensym%%_805.y)}); + (((gensym%%_806) == (null)) ? undefined : gensym%%_806.length)}); } diff --git a/ui2abc/libarkts/test/arkts-api/recheck/static/trailing-block/dump-src/main.ets b/ui2abc/libarkts/test/arkts-api/recheck/static/trailing-block/dump-src/main.ets index 97ac6287fc..0cbbc4c564 100644 --- a/ui2abc/libarkts/test/arkts-api/recheck/static/trailing-block/dump-src/main.ets +++ b/ui2abc/libarkts/test/arkts-api/recheck/static/trailing-block/dump-src/main.ets @@ -7,7 +7,7 @@ class C { public f(arg: (()=> void)): void {} public g(): void { - this.f((() => { + this.f(((): void => { const x = 11; })); } -- Gitee