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 when parsing faulty dictionaries

Browse Source
This commit is contained in:
HolonProduction
2025-01-31 00:04:01 +01:00
parent 134da37497
commit ca1e444bca
30 changed files with 177 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/gdscript/gdscript_parser.cpp
View File

@@ -3123,13 +3123,9 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode
case DictionaryNode::LUA_TABLE:
if (key != nullptr && key->type != Node::IDENTIFIER && key->type != Node::LITERAL) {
push_error(R"(Expected identifier or string as Lua-style dictionary key (e.g "{ key = value }").)");
advance();
break;
}
if (key != nullptr && key->type == Node::LITERAL && static_cast<LiteralNode *>(key)->value.get_type() != Variant::STRING) {
push_error(R"(Expected identifier or string as Lua-style dictionary key (e.g "{ key = value }").)");
advance();
break;
}
if (!match(GDScriptTokenizer::Token::EQUAL)) {
if (match(GDScriptTokenizer::Token::COLON)) {
@@ -3169,6 +3165,21 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode
if (key != nullptr && value != nullptr) {
dictionary->elements.push_back({ key, value });
}
// Do phrase level recovery by inserting an imaginary expression for missing keys or values.
// This ensures the successfully parsed expression is part of the AST and can be analyzed.
if (key != nullptr && value == nullptr) {
LiteralNode *dummy = alloc_recovery_node<LiteralNode>();
dummy->value = Variant();
dictionary->elements.push_back({ key, dummy });
} else if (key == nullptr && value != nullptr) {
LiteralNode *dummy = alloc_recovery_node<LiteralNode>();
dummy->value = Variant();
dictionary->elements.push_back({ dummy, value });
}
} while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end());
}
pop_multiline();

12
modules/gdscript/gdscript_parser.h
View File

@@ -1453,6 +1453,18 @@ private:
return node;
}
// Allocates a node for patching up the parse tree when an error occurred.
// Such nodes don't track their extents as they don't relate to actual tokens.
template <typename T>
T *alloc_recovery_node() {
T *node = memnew(T);
node->next = list;
list = node;
return node;
}
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_dictionary/lua_key_1.cfg Normal file
View File

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

6
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_key_1.gd Normal file
View File

@@ -0,0 +1,6 @@
extends Node
var test = {
t = 1,
AutoTranslateMode.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_key_2.cfg Normal file
View File

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

10
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_key_2.gd Normal file
View File

@@ -0,0 +1,10 @@
extends Node
enum TestEnum {
VALUE,
}
var test = {
t = 1,
TestEnum.➡ = 1,
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_1.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_dictionary/lua_value_1.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
var test = {
t = AutoTranslateMode.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_2.cfg Normal file
View File

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

9
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_2.gd Normal file
View File

@@ -0,0 +1,9 @@
extends Node
enum TestEnum {
VALUE,
}
var test = {
= TestEnum.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_3.cfg Normal file
View File

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

6
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_3.gd Normal file
View File

@@ -0,0 +1,6 @@
extends Node
var test = {
t = 1,
e AutoTranslateMode.➡,
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_4.cfg Normal file
View File

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

9
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_4.gd Normal file
View File

@@ -0,0 +1,9 @@
extends Node
enum TestEnum {
VALUE,
}
var test = {
1 = TestEnum.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_5.cfg Normal file
View File

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

6
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/lua_value_5.gd Normal file
View File

@@ -0,0 +1,6 @@
extends Node
var test = {
t = 1,
1 AutoTranslateMode.➡,
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_key_1.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_dictionary/py_key_1.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
var test = {
AutoTranslateMode.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_key_2.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_dictionary/py_key_2.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
var test = {
AutoTranslateMode.➡:
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_key_3.cfg Normal file
View File

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

9
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_key_3.gd Normal file
View File

@@ -0,0 +1,9 @@
extends Node
enum TestEnum {
VALUE,
}
var test = {
TestEnum.➡ "test"
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_key_4.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_dictionary/py_key_4.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
var test = {
AutoTranslateMode.➡: 1
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_value_1.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_dictionary/py_value_1.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
var test = {
1: AutoTranslateMode.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_value_2.cfg Normal file
View File

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

9
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_value_2.gd Normal file
View File

@@ -0,0 +1,9 @@
extends Node
enum TestEnum {
VALUE,
}
var test = {
: TestEnum.➡
}

4
modules/gdscript/tests/scripts/completion/enum_values_in_dictionary/py_value_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_dictionary/py_value_3.gd Normal file
View File

@@ -0,0 +1,5 @@
extends Node
var test = {
1 AutoTranslateMode.➡
}