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

ScriptEditor: Remove obsolete completion cache

This commit is contained in:
HolonProduction 2024-08-15 21:22:41 +02:00
parent ee363af0ed
commit 12701487a5
4 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/object/script_language.cpp
View File

@ -493,11 +493,6 @@ void ScriptServer::save_global_classes() {
//////////////////// ////////////////////
ScriptCodeCompletionCache *ScriptCodeCompletionCache::singleton = nullptr;
ScriptCodeCompletionCache::ScriptCodeCompletionCache() {
singleton = this;
}
void ScriptLanguage::get_core_type_words(List<String> *p_core_type_words) const { void ScriptLanguage::get_core_type_words(List<String> *p_core_type_words) const {
p_core_type_words->push_back("String"); p_core_type_words->push_back("String");
p_core_type_words->push_back("Vector2"); p_core_type_words->push_back("Vector2");

11
core/object/script_language.h
View File

@ -185,17 +185,6 @@ public:
Script() {} Script() {}
}; };
class ScriptCodeCompletionCache {
static ScriptCodeCompletionCache *singleton;
public:
static ScriptCodeCompletionCache *get_singleton() { return singleton; }
ScriptCodeCompletionCache();
virtual ~ScriptCodeCompletionCache() {}
};
class ScriptLanguage : public Object { class ScriptLanguage : public Object {
GDCLASS(ScriptLanguage, Object) GDCLASS(ScriptLanguage, Object)

68
editor/plugins/script_editor_plugin.cpp
View File

@ -279,69 +279,6 @@ void ScriptEditorBase::_bind_methods() {
ADD_SIGNAL(MethodInfo("go_to_method", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::STRING, "method"))); ADD_SIGNAL(MethodInfo("go_to_method", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::STRING, "method")));
} }
class EditorScriptCodeCompletionCache : public ScriptCodeCompletionCache {
struct Cache {
uint64_t time_loaded = 0;
Ref<Resource> cache;
};
HashMap<String, Cache> cached;
public:
uint64_t max_time_cache = 5 * 60 * 1000; //minutes, five
uint32_t max_cache_size = 128;
void cleanup() {
List<String> to_clean;
HashMap<String, Cache>::Iterator I = cached.begin();
while (I) {
if ((OS::get_singleton()->get_ticks_msec() - I->value.time_loaded) > max_time_cache) {
to_clean.push_back(I->key);
}
++I;
}
while (to_clean.front()) {
cached.erase(to_clean.front()->get());
to_clean.pop_front();
}
}
virtual Ref<Resource> get_cached_resource(const String &p_path) {
HashMap<String, Cache>::Iterator E = cached.find(p_path);
if (!E) {
Cache c;
c.cache = ResourceLoader::load(p_path);
E = cached.insert(p_path, c);
}
E->value.time_loaded = OS::get_singleton()->get_ticks_msec();
if (cached.size() > max_cache_size) {
uint64_t older;
HashMap<String, Cache>::Iterator O = cached.begin();
older = O->value.time_loaded;
HashMap<String, Cache>::Iterator I = O;
while (I) {
if (I->value.time_loaded < older) {
older = I->value.time_loaded;
O = I;
}
++I;
}
if (O != E) { //should never happen..
cached.remove(O);
}
}
return E->value.cache;
}
virtual ~EditorScriptCodeCompletionCache() {}
};
void ScriptEditorQuickOpen::popup_dialog(const Vector<String> &p_functions, bool p_dontclear) { void ScriptEditorQuickOpen::popup_dialog(const Vector<String> &p_functions, bool p_dontclear) {
popup_centered_ratio(0.6); popup_centered_ratio(0.6);
if (p_dontclear) { if (p_dontclear) {
@ -3989,7 +3926,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
script_editor_cache.instantiate(); script_editor_cache.instantiate();
script_editor_cache->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("script_editor_cache.cfg")); script_editor_cache->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("script_editor_cache.cfg"));
completion_cache = memnew(EditorScriptCodeCompletionCache);
restoring_layout = false; restoring_layout = false;
waiting_update_names = false; waiting_update_names = false;
pending_auto_reload = false; pending_auto_reload = false;
@ -4334,10 +4270,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
_update_online_doc(); _update_online_doc();
} }
ScriptEditor::~ScriptEditor() {
memdelete(completion_cache);
}
void ScriptEditorPlugin::_focus_another_editor() { void ScriptEditorPlugin::_focus_another_editor() {
if (window_wrapper->get_window_enabled()) { if (window_wrapper->get_window_enabled()) {
ERR_FAIL_COND(last_editor.is_empty()); ERR_FAIL_COND(last_editor.is_empty());

3
editor/plugins/script_editor_plugin.h
View File

@ -396,8 +396,6 @@ class ScriptEditor : public PanelContainer {
void _update_selected_editor_menu(); void _update_selected_editor_menu();
EditorScriptCodeCompletionCache *completion_cache = nullptr;
void _editor_stop(); void _editor_stop();
int edit_pass; int edit_pass;
@ -577,7 +575,6 @@ public:
static void register_create_script_editor_function(CreateScriptEditorFunc p_func); static void register_create_script_editor_function(CreateScriptEditorFunc p_func);
ScriptEditor(WindowWrapper *p_wrapper); ScriptEditor(WindowWrapper *p_wrapper);
~ScriptEditor();
}; };
class ScriptEditorPlugin : public EditorPlugin { class ScriptEditorPlugin : public EditorPlugin {