Skip to content

Try to fix variable assignment in multi line lambda definitions #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devdinc wants to merge 2 commits into from
Closed

Try to fix variable assignment in multi line lambda definitions #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f2979c
Try to fix variable assignment in multi line lambda definitions
devdinc Apr 18, 2026
7bfa117
Refactor multiline lambda test cases
devdinc Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions scripts/libs/functionsv2.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,17 @@ local function walk(n: object, list: object) :: objects:
walk(loop-value, {_list})
return ...{_list}

condition set %object% to [new] lambda[ %-objects%](1:|2:-|3:+):
condition (create|define) [a] [new] (1:|2:non-returning|3:returning) lambda [with] [%-objects%] ((and store it|stored) in|as) %object%:
parse:
set {_functionsv2.sk::ctx::origin} to SkriptLogger.getNode()
set {_functionsv2.sk::ctx::script} to script ({_functionsv2.sk::ctx::origin}.getConfig().getFileName())
if {_functionsv2.sk::ctx::script} is not set: # likely inner lambda
set {_functionsv2.sk::ctx::script} to current script
set {_functionsv2.sk::ctx::vars} to expr-2

set {_functionsv2.sk::ctx::vars} to expr-1
set {_functionsv2.sk::ctx::originindent} to {_functionsv2.sk::ctx::origin}.[Node]getIndentation()
set {_functionsv2.sk::ctx::nodes::*} to walk({_functionsv2.sk::ctx::origin}, {_none})

loop {_functionsv2.sk::ctx::nodes::*}:
set {_functionsv2.sk::ctx::indent} to loop-value.[Node]getIndentation().substring(length of {_functionsv2.sk::ctx::originindent} + 4) if {_functionsv2.sk::ctx::originindent} starts with " " else loop-value.[Node]getIndentation().substring(length of {_functionsv2.sk::ctx::originindent} + 1)
set {_functionsv2.sk::ctx::key} to "%{_functionsv2.sk::ctx::indent}%%loop-value.getKey()%"
Expand All @@ -159,17 +161,18 @@ condition set %object% to [new] lambda[ %-objects%](1:|2:-|3:+):
set {_functionsv2.sk::ctx::noreturn} to false if parse mark is 3
set {_functionsv2.sk::ctx::args::*} to FextractArgs({_functionsv2.sk::ctx::vars})
continue

check:
set raw expression of expr-1 to build lambda args {_functionsv2.sk::ctx::args::*} body {_functionsv2.sk::ctx::expr::*} noreturn {_functionsv2.sk::ctx::noreturn} script {_functionsv2.sk::ctx::script}
set raw expression of expr-2 to build lambda args {_functionsv2.sk::ctx::args::*} body {_functionsv2.sk::ctx::expr::*} noreturn {_functionsv2.sk::ctx::noreturn} script {_functionsv2.sk::ctx::script}

condition set %object% to [new] (1:supplier|1:getter|2:runnable|2:runner|3:consumer|3:accepter|4:function|4:applier|5:biconsumer|5:biaccepter|6:bifunction|6:biapplier)[ %-objects%]:
condition (create|define) [a] [new] (1:supplier|1:getter|2:runnable|2:runner|3:consumer|3:accepter|4:function|4:applier|5:biconsumer|5:biaccepter|6:bifunction|6:biapplier) [with] [%-objects%] ((and store it|stored) in|as) %object%:
parse:
set {_functionsv2.sk::ctx::origin} to SkriptLogger.getNode()
set {_functionsv2.sk::ctx::script} to script ({_functionsv2.sk::ctx::origin}.getConfig().getFileName())
if {_functionsv2.sk::ctx::script} is not set:
set {_functionsv2.sk::ctx::script} to current script

set {_functionsv2.sk::ctx::vars} to expr-2
set {_functionsv2.sk::ctx::vars} to expr-1
set {_functionsv2.sk::ctx::originindent} to {_functionsv2.sk::ctx::origin}.[Node]getIndentation()
set {_functionsv2.sk::ctx::nodes::*} to walk({_functionsv2.sk::ctx::origin}, {_none})

Expand All @@ -188,19 +191,23 @@ condition set %object% to [new] (1:supplier|1:getter|2:runnable|2:runner|3:consu
parse mark is 6
then:
set {_functionsv2.sk::ctx::noreturn} to false

set {_functionsv2.sk::ctx::args::*} to FextractArgs({_functionsv2.sk::ctx::vars})

if any:
parse mark is 1
parse mark is 2
then:
if size of {_functionsv2.sk::ctx::args::*} > 0:
stop

if any:
parse mark is 3
parse mark is 4
then:
if size of {_functionsv2.sk::ctx::args::*} is 0:
stop

if any:
parse mark is 5
parse mark is 6
Expand All @@ -211,7 +218,7 @@ condition set %object% to [new] (1:supplier|1:getter|2:runnable|2:runner|3:consu
continue

check:
set raw expression of expr-1 to build lambda args {_functionsv2.sk::ctx::args::*} body {_functionsv2.sk::ctx::expr::*} noreturn {_functionsv2.sk::ctx::noreturn} script {_functionsv2.sk::ctx::script}
set raw expression of expr-2 to build lambda args {_functionsv2.sk::ctx::args::*} body {_functionsv2.sk::ctx::expr::*} noreturn {_functionsv2.sk::ctx::noreturn} script {_functionsv2.sk::ctx::script}

expression run[ lambda] %object%[ with %-objects%]:
get:
Expand Down
11 changes: 7 additions & 4 deletions tests/working/libs/functionsv2.test.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,29 +110,32 @@ test "java call":
assert {_val}.getClass().getSimpleName().equalsIgnoreCase("URL") is true

test "run multiline lambda with return":
set {_sup} to lambda:
create lambda stored in {_sup}:
set {_x} to "yes"
return {_x}
assert (run lambda {_sup}) is "yes" with "multiline lambda return failed"

test "multiline lambda multiple runs":
clear {-functions::test::*}
set {-functions::test::varl} to 0
set {_sup} to lambda:

create lambda stored in {_sup}:
add 1 to {-functions::test::varl}
return {-functions::test::varl}

assert (run lambda {_sup}) is 1
assert (run lambda {_sup}) is 2

test "multiline lambda with if":
set {_sup} to lambda:
create lambda stored in {_sup}:
if {_none} is not set:
return "yes"
return "no"

assert (run lambda {_sup}) is "yes" with "if control flow failed"

test "multiline supplier":
set {_sup} to new supplier:
create supplier stored in {_sup}:
set {_a} to 1
return {_a}
assert (run lambda {_sup}) is 1
Expand Down
Loading