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

Merge pull request #102933 from KoBeWi/antivirus

Browse Source 
Don't synchronize scripts with errors
This commit is contained in:
Thaddeus Crews
2025-05-09 11:29:13 -05:00
parent cb0f2b5230 9e0203a58a
commit f0edac3d36
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/script_editor_plugin.cpp
View File

@@ -1099,6 +1099,17 @@ void ScriptEditor::_mark_built_in_scripts_as_saved(const String &p_parent_path)
void ScriptEditor::trigger_live_script_reload(const String &p_script_path) { void ScriptEditor::trigger_live_script_reload(const String &p_script_path) {
if (!script_paths_to_reload.has(p_script_path)) { if (!script_paths_to_reload.has(p_script_path)) {
Ref<Script> reloaded_script = ResourceCache::get_ref(p_script_path);
if (reloaded_script.is_null()) {
reloaded_script = ResourceLoader::load(p_script_path);
}
if (reloaded_script.is_valid()) {
if (!reloaded_script->get_language()->validate(reloaded_script->get_source_code(), p_script_path)) {
// Script has errors, don't live reload.
return;
}
}
script_paths_to_reload.append(p_script_path); script_paths_to_reload.append(p_script_path);
} }
if (!pending_auto_reload && auto_reload_running_scripts) { if (!pending_auto_reload && auto_reload_running_scripts) {

2
modules/gdscript/gdscript_editor.cpp
View File

@@ -177,7 +177,7 @@ bool GDScriptLanguage::validate(const String &p_script, const String &p_path, Li
} }
} }
return false; return false;
} else { } else if (r_functions) {
const GDScriptParser::ClassNode *cl = parser.get_tree(); const GDScriptParser::ClassNode *cl = parser.get_tree();
HashMap<int, String> funcs; HashMap<int, String> funcs;