Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

GDScript: Allow multiple lines in signal parameters declaration

4.0
George Marques 2021-09-21 13:40:39 +07:00
parent db028ac700
commit bab0afc821
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gdscript/gdscript_parser.cpp
Unescape Escape View File

@ -1053,7 +1053,9 @@ GDScriptParser::SignalNode *GDScriptParser::parse_signal() {
SignalNode *signal = alloc_node<SignalNode>();
signal->identifier = parse_identifier();
if (match(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
if (check(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
push_multiline(true);
advance();
do {
if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
// Allow for trailing comma.
@ -1076,6 +1078,7 @@ GDScriptParser::SignalNode *GDScriptParser::parse_signal() {
}
} while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end());
pop_multiline();
consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after signal parameters.)*");
}

20
modules/gdscript/tests/scripts/parser/features/signal_declaration.gd
Unescape Escape View File

@ -0,0 +1,20 @@
#GDTEST_OK
# No parentheses.
signal a
# No parameters.
signal b()
# With paramters.
signal c(a, b, c)
# With parameters multiline.
signal d(
a,
b,
c,
)
func test():
print("Ok")

2
modules/gdscript/tests/scripts/parser/features/signal_declaration.out
Unescape Escape View File

@ -0,0 +1,2 @@
GDTEST_OK
Ok