Merge pull request #77578 from RedworkDE/invalidate-doccache-on-change

Invalidate the DocCache when updating the XML docs
godotengine · May 29, 2023 · 2f57da2 · 2f57da2
2 parents d3867e3 + 67e8c57
commit 2f57da2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/editor/editor_builders.py b/editor/editor_builders.py
@@ -37,6 +37,7 @@ def make_doc_header(target, source, env):
     g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
     g.write("#ifndef _DOC_DATA_RAW_H\n")
     g.write("#define _DOC_DATA_RAW_H\n")
+    g.write('static const char *_doc_data_hash = "' + str(hash(buf)) + '";\n')
     g.write("static const int _doc_data_compressed_size = " + str(len(buf)) + ";\n")
     g.write("static const int _doc_data_uncompressed_size = " + str(decomp_size) + ";\n")
     g.write("static const unsigned char _doc_data_compressed[] = {\n")

diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
@@ -2258,7 +2258,7 @@ String EditorHelp::get_cache_full_path() {
 static bool first_attempt = true;
 
 static String _compute_doc_version_hash() {
-	return uitos(ClassDB::get_api_hash(ClassDB::API_CORE)) + "-" + uitos(ClassDB::get_api_hash(ClassDB::API_EDITOR));
+	return vformat("%d/%d/%s", ClassDB::get_api_hash(ClassDB::API_CORE), ClassDB::get_api_hash(ClassDB::API_EDITOR), _doc_data_hash);
 }
 
 void EditorHelp::_load_doc_thread(void *p_udata) {