godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

GDScript: Do phrase level recovery for match

Browse Source
This commit is contained in:
HolonProduction
2025-04-15 12:21:32 +02:00
parent e5ccaa79e2
commit 4a0e40f6ea
16 changed files with 100 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gdscript/gdscript_parser.cpp
View File

@@ -2359,8 +2359,16 @@ GDScriptParser::MatchBranchNode *GDScriptParser::parse_match_branch() {
}
if (!consume(GDScriptTokenizer::Token::COLON, vformat(R"(Expected ":"%s after "match" %s.)", has_guard ? "" : R"( or "when")", has_guard ? "pattern guard" : "patterns"))) {
branch->block = alloc_recovery_suite();
complete_extents(branch);
return nullptr;
// Consume the whole line and treat the next one as new match branch.
while (current.type != GDScriptTokenizer::Token::NEWLINE && !is_at_end()) {
advance();
}
if (!is_at_end()) {
advance();
}
return branch;
}
SuiteNode *suite = alloc_node<SuiteNode>();

8
modules/gdscript/gdscript_parser.h
View File

@@ -1463,6 +1463,14 @@ private:
return node;
}
SuiteNode *alloc_recovery_suite() {
SuiteNode *suite = alloc_recovery_node<SuiteNode>();
suite->parent_block = current_suite;
suite->parent_function = current_function;
suite->is_in_loop = current_suite->is_in_loop;
return suite;
}
void clear();
void push_error(const String &p_message, const Node *p_origin = nullptr);
#ifdef DEBUG_ENABLED

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_1.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "AUTO_TRANSLATE_MODE_INHERIT"},
]

7
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_1.gd Normal file
View File

@@ -0,0 +1,7 @@
extends Node
var t
func test():
match t:
AutoTranslateMode.➡

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_2.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "VALUE"},
]

11
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_2.gd Normal file
View File

@@ -0,0 +1,11 @@
extends Node
enum TestEnum {
VALUE,
}
var t
func test():
match t:
TestEnum.➡ where

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_3.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "VALUE"},
]

11
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_3.gd Normal file
View File

@@ -0,0 +1,11 @@
extends Node
enum TestEnum {
VALUE,
}
var t
func test():
match t:
TestEnum.➡:

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_1.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "AUTO_TRANSLATE_MODE_INHERIT"},
]

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_1.gd Normal file
View File

@@ -0,0 +1,4 @@
extends Node
func test():
match AutoTranslateMode.➡

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_2.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "VALUE"},
]

8
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_2.gd Normal file
View File

@@ -0,0 +1,8 @@
extends Node
enum TestEnum {
VALUE,
}
func test():
match TestEnum.➡:

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_3.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "AUTO_TRANSLATE_MODE_INHERIT"},
]

5
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_3.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
func test():
match AutoTranslateMode.➡:
pass

4
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_4.cfg Normal file
View File

@@ -0,0 +1,4 @@
[output]
include=[
{"display": "VALUE"},
]

9
modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_4.gd Normal file
View File

@@ -0,0 +1,9 @@
extends Node
enum TestEnum {
VALUE,
}
func test():
match TestEnum.➡:
TestEnum