Merge pull request #105413 from HolonProduction/gdscript-recover-match

GDScript: Do phrase level recovery for match

Author: Repiteo

modules/gdscript/gdscript_parser.cpp

@@ -2421,8 +2421,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>();

modules/gdscript/gdscript_parser.h

@@ -1464,6 +1464,14 @@ class GDScriptParser {
 		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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_1.cfg

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_1.gd

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_2.cfg

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_2.gd

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_3.cfg

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_branch_3.gd

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_1.cfg

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

modules/gdscript/tests/scripts/completion/enum_values_in_match/in_test_1.gd

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