godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94131 from dalexeev/gds-fix-mismatched-parser-autoloads 

GDScript: Fix "Mismatched external parser" for autoloads
This commit is contained in:
Rémi Verschelde 2024-07-09 16:47:32 +02:00
parent 5514510f7f 110c4d4067
commit 26d1577f39
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config/project_settings.cpp
View File

@ -329,9 +329,9 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) {
String path = p_value; String path = p_value;
if (path.begins_with("*")) { if (path.begins_with("*")) {
autoload.is_singleton = true; autoload.is_singleton = true;
autoload.path = path.substr(1); autoload.path = path.substr(1).simplify_path();
} else { } else {
autoload.path = path; autoload.path = path.simplify_path();
} }
add_autoload(autoload); add_autoload(autoload);
} else if (p_name.operator String().begins_with("global_group/")) { } else if (p_name.operator String().begins_with("global_group/")) {

2
modules/gdscript/gdscript_parser.cpp
View File

@ -413,7 +413,7 @@ Error GDScriptParser::parse_binary(const Vector<uint8_t> &p_binary, const String
} }
tokenizer = buffer_tokenizer; tokenizer = buffer_tokenizer;
script_path = p_script_path; script_path = p_script_path.simplify_path();
current = tokenizer->scan(); current = tokenizer->scan();
// Avoid error or newline as the first token. // Avoid error or newline as the first token.
// The latter can mess with the parser when opening files filled exclusively with comments and newlines. // The latter can mess with the parser when opening files filled exclusively with comments and newlines.