From bec6fd0c37978af446dd6664c21dcca875981cd4 Mon Sep 17 00:00:00 2001
From: Danil Alexeev <dalexeev12@yandex.ru>
Date: Sat, 7 Dec 2024 10:19:56 +0300
Subject: [PATCH] Code Editor: Add documentation tooltips

---
 core/object/script_language.h                 |  33 +-
 core/object/script_language_extension.cpp     |   5 +-
 core/object/script_language_extension.h       |  38 +-
 doc/classes/CodeEdit.xml                      |  13 +
 doc/classes/ScriptExtension.xml               |   5 +
 doc/classes/ScriptLanguageExtension.xml       |   8 +-
 editor/editor_help.cpp                        | 328 +++++++++++++++---
 editor/editor_help.h                          |  15 +-
 editor/editor_inspector.cpp                   |  16 +-
 editor/plugins/script_text_editor.cpp         | 170 +++++++--
 editor/plugins/script_text_editor.h           |   2 +
 modules/gdscript/editor/gdscript_docgen.cpp   |  11 +
 modules/gdscript/editor/gdscript_docgen.h     |   1 +
 modules/gdscript/gdscript.cpp                 |  16 +-
 modules/gdscript/gdscript.h                   |   8 +-
 modules/gdscript/gdscript_editor.cpp          | 154 ++++++--
 modules/gdscript/gdscript_parser.cpp          |  33 ++
 .../language_server/gdscript_workspace.cpp    |   9 +-
 modules/mono/csharp_script.h                  |   1 +
 scene/gui/code_edit.cpp                       |  42 +++
 scene/gui/code_edit.h                         |  16 +-
 21 files changed, 751 insertions(+), 173 deletions(-)

diff --git a/core/object/script_language.h b/core/object/script_language.h
index 31d6638e58e8..e7f312f5aed3 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -150,6 +150,7 @@ class Script : public Resource {
 	virtual Error reload(bool p_keep_state = false) = 0;
 
 #ifdef TOOLS_ENABLED
+	virtual StringName get_doc_class_name() const = 0;
 	virtual Vector<DocData::ClassDoc> get_documentation() const = 0;
 	virtual String get_class_icon_path() const = 0;
 	virtual PropertyInfo get_class_category() const;
@@ -181,7 +182,7 @@ class Script : public Resource {
 	virtual int get_member_line(const StringName &p_member) const { return -1; }
 
 	virtual void get_constants(HashMap<StringName, Variant> *p_constants) {}
-	virtual void get_members(HashSet<StringName> *p_constants) {}
+	virtual void get_members(HashSet<StringName> *p_members) {}
 
 	virtual bool is_placeholder_fallback_enabled() const { return false; }
 
@@ -340,25 +341,43 @@ class ScriptLanguage : public Object {
 	virtual Error complete_code(const String &p_code, const String &p_path, Object *p_owner, List<CodeCompletionOption> *r_options, bool &r_force, String &r_call_hint) { return ERR_UNAVAILABLE; }
 
 	enum LookupResultType {
-		LOOKUP_RESULT_SCRIPT_LOCATION,
+		LOOKUP_RESULT_SCRIPT_LOCATION, // Use if none of the options below apply.
 		LOOKUP_RESULT_CLASS,
 		LOOKUP_RESULT_CLASS_CONSTANT,
 		LOOKUP_RESULT_CLASS_PROPERTY,
 		LOOKUP_RESULT_CLASS_METHOD,
 		LOOKUP_RESULT_CLASS_SIGNAL,
 		LOOKUP_RESULT_CLASS_ENUM,
-		LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE,
+		LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE, // Deprecated.
 		LOOKUP_RESULT_CLASS_ANNOTATION,
-		LOOKUP_RESULT_MAX
+		LOOKUP_RESULT_LOCAL_CONSTANT,
+		LOOKUP_RESULT_LOCAL_VARIABLE,
+		LOOKUP_RESULT_MAX,
 	};
 
 	struct LookupResult {
 		LookupResultType type;
-		Ref<Script> script;
+
+		// For `CLASS_*`.
 		String class_name;
 		String class_member;
-		String class_path;
-		int location;
+
+		// For `LOCAL_*`.
+		String description;
+		bool is_deprecated = false;
+		String deprecated_message;
+		bool is_experimental = false;
+		String experimental_message;
+
+		// For `LOCAL_*`.
+		String doc_type;
+		String enumeration;
+		bool is_bitfield = false;
+
+		// `SCRIPT_LOCATION` and `LOCAL_*` must have, `CLASS_*` can have.
+		Ref<Script> script;
+		String script_path;
+		int location = -1;
 	};
 
 	virtual Error lookup_code(const String &p_code, const String &p_symbol, const String &p_path, Object *p_owner, LookupResult &r_result) { return ERR_UNAVAILABLE; }
diff --git a/core/object/script_language_extension.cpp b/core/object/script_language_extension.cpp
index 73f7ec5a5444..336f980dc9b8 100644
--- a/core/object/script_language_extension.cpp
+++ b/core/object/script_language_extension.cpp
@@ -51,6 +51,7 @@ void ScriptExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_set_source_code, "code");
 	GDVIRTUAL_BIND(_reload, "keep_state");
 
+	GDVIRTUAL_BIND(_get_doc_class_name);
 	GDVIRTUAL_BIND(_get_documentation);
 	GDVIRTUAL_BIND(_get_class_icon_path);
 
@@ -169,8 +170,10 @@ void ScriptLanguageExtension::_bind_methods() {
 	BIND_ENUM_CONSTANT(LOOKUP_RESULT_CLASS_METHOD);
 	BIND_ENUM_CONSTANT(LOOKUP_RESULT_CLASS_SIGNAL);
 	BIND_ENUM_CONSTANT(LOOKUP_RESULT_CLASS_ENUM);
-	BIND_ENUM_CONSTANT(LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE);
+	BIND_ENUM_CONSTANT(LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE); // Deprecated.
 	BIND_ENUM_CONSTANT(LOOKUP_RESULT_CLASS_ANNOTATION);
+	BIND_ENUM_CONSTANT(LOOKUP_RESULT_LOCAL_CONSTANT);
+	BIND_ENUM_CONSTANT(LOOKUP_RESULT_LOCAL_VARIABLE);
 	BIND_ENUM_CONSTANT(LOOKUP_RESULT_MAX);
 
 	BIND_ENUM_CONSTANT(LOCATION_LOCAL);
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index d2dce34d4fed..1ddf735c29cb 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -76,9 +76,16 @@ class ScriptExtension : public Script {
 	EXBIND1(set_source_code, const String &)
 	EXBIND1R(Error, reload, bool)
 
+	GDVIRTUAL0RC_REQUIRED(StringName, _get_doc_class_name)
 	GDVIRTUAL0RC_REQUIRED(TypedArray<Dictionary>, _get_documentation)
 	GDVIRTUAL0RC(String, _get_class_icon_path)
 #ifdef TOOLS_ENABLED
+	virtual StringName get_doc_class_name() const override {
+		StringName ret;
+		GDVIRTUAL_CALL(_get_doc_class_name, ret);
+		return ret;
+	}
+
 	virtual Vector<DocData::ClassDoc> get_documentation() const override {
 		TypedArray<Dictionary> doc;
 		GDVIRTUAL_CALL(_get_documentation, doc);
@@ -454,22 +461,29 @@ class ScriptLanguageExtension : public ScriptLanguage {
 	virtual Error lookup_code(const String &p_code, const String &p_symbol, const String &p_path, Object *p_owner, LookupResult &r_result) override {
 		Dictionary ret;
 		GDVIRTUAL_CALL(_lookup_code, p_code, p_symbol, p_path, p_owner, ret);
-		if (!ret.has("result")) {
-			return ERR_UNAVAILABLE;
-		}
+
+		ERR_FAIL_COND_V(!ret.has("result"), ERR_UNAVAILABLE);
+		const Error result = Error(int(ret["result"]));
 
 		ERR_FAIL_COND_V(!ret.has("type"), ERR_UNAVAILABLE);
 		r_result.type = LookupResultType(int(ret["type"]));
-		ERR_FAIL_COND_V(!ret.has("script"), ERR_UNAVAILABLE);
-		r_result.script = ret["script"];
-		ERR_FAIL_COND_V(!ret.has("class_name"), ERR_UNAVAILABLE);
-		r_result.class_name = ret["class_name"];
-		ERR_FAIL_COND_V(!ret.has("class_path"), ERR_UNAVAILABLE);
-		r_result.class_path = ret["class_path"];
-		ERR_FAIL_COND_V(!ret.has("location"), ERR_UNAVAILABLE);
-		r_result.location = ret["location"];
 
-		Error result = Error(int(ret["result"]));
+		r_result.class_name = ret.get("class_name", "");
+		r_result.class_member = ret.get("class_member", "");
+
+		r_result.description = ret.get("description", "");
+		r_result.is_deprecated = ret.get("is_deprecated", false);
+		r_result.deprecated_message = ret.get("deprecated_message", "");
+		r_result.is_deprecated = ret.get("is_deprecated", false);
+		r_result.experimental_message = ret.get("experimental_message", "");
+
+		r_result.doc_type = ret.get("doc_type", "");
+		r_result.enumeration = ret.get("enumeration", "");
+		r_result.is_bitfield = ret.get("is_bitfield", false);
+
+		r_result.script = ret.get("script", Ref<Script>());
+		r_result.script_path = ret.get("script_path", "");
+		r_result.location = ret.get("location", -1);
 
 		return result;
 	}
diff --git a/doc/classes/CodeEdit.xml b/doc/classes/CodeEdit.xml
index a65d587e8b47..77d3728677e8 100644
--- a/doc/classes/CodeEdit.xml
+++ b/doc/classes/CodeEdit.xml
@@ -587,6 +587,9 @@
 		<member name="symbol_lookup_on_click" type="bool" setter="set_symbol_lookup_on_click_enabled" getter="is_symbol_lookup_on_click_enabled" default="false">
 			Set when a validated word from [signal symbol_validate] is clicked, the [signal symbol_lookup] should be emitted.
 		</member>
+		<member name="symbol_tooltip_on_hover" type="bool" setter="set_symbol_tooltip_on_hover_enabled" getter="is_symbol_tooltip_on_hover_enabled" default="false">
+			Set when a word is hovered, the [signal symbol_hovered] should be emitted.
+		</member>
 		<member name="text_direction" type="int" setter="set_text_direction" getter="get_text_direction" overrides="TextEdit" enum="Control.TextDirection" default="1" />
 	</members>
 	<signals>
@@ -601,6 +604,15 @@
 				Emitted when the user requests code completion. This signal will not be sent if [method _request_code_completion] is overridden or [member code_completion_enabled] is [code]false[/code].
 			</description>
 		</signal>
+		<signal name="symbol_hovered">
+			<param index="0" name="symbol" type="String" />
+			<param index="1" name="line" type="int" />
+			<param index="2" name="column" type="int" />
+			<description>
+				Emitted when the user hovers over a symbol. Unlike [signal Control.mouse_entered], this signal is not emitted immediately, but when the cursor is over the symbol for [member ProjectSettings.gui/timers/tooltip_delay_sec] seconds.
+				[b]Note:[/b] [member symbol_tooltip_on_hover] must be [code]true[/code] for this signal to be emitted.
+			</description>
+		</signal>
 		<signal name="symbol_lookup">
 			<param index="0" name="symbol" type="String" />
 			<param index="1" name="line" type="int" />
@@ -613,6 +625,7 @@
 			<param index="0" name="symbol" type="String" />
 			<description>
 				Emitted when the user hovers over a symbol. The symbol should be validated and responded to, by calling [method set_symbol_lookup_word_as_valid].
+				[b]Note:[/b] [member symbol_lookup_on_click] must be [code]true[/code] for this signal to be emitted.
 			</description>
 		</signal>
 	</signals>
diff --git a/doc/classes/ScriptExtension.xml b/doc/classes/ScriptExtension.xml
index d102676035cf..0a4b81d442e7 100644
--- a/doc/classes/ScriptExtension.xml
+++ b/doc/classes/ScriptExtension.xml
@@ -32,6 +32,11 @@
 			<description>
 			</description>
 		</method>
+		<method name="_get_doc_class_name" qualifiers="virtual const">
+			<return type="StringName" />
+			<description>
+			</description>
+		</method>
 		<method name="_get_documentation" qualifiers="virtual const">
 			<return type="Dictionary[]" />
 			<description>
diff --git a/doc/classes/ScriptLanguageExtension.xml b/doc/classes/ScriptLanguageExtension.xml
index f9d9e4f513e1..40e56478c51c 100644
--- a/doc/classes/ScriptLanguageExtension.xml
+++ b/doc/classes/ScriptLanguageExtension.xml
@@ -387,11 +387,15 @@
 		</constant>
 		<constant name="LOOKUP_RESULT_CLASS_ENUM" value="6" enum="LookupResultType">
 		</constant>
-		<constant name="LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE" value="7" enum="LookupResultType">
+		<constant name="LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE" value="7" enum="LookupResultType" deprecated="">
 		</constant>
 		<constant name="LOOKUP_RESULT_CLASS_ANNOTATION" value="8" enum="LookupResultType">
 		</constant>
-		<constant name="LOOKUP_RESULT_MAX" value="9" enum="LookupResultType">
+		<constant name="LOOKUP_RESULT_LOCAL_CONSTANT" value="9" enum="LookupResultType">
+		</constant>
+		<constant name="LOOKUP_RESULT_LOCAL_VARIABLE" value="10" enum="LookupResultType">
+		</constant>
+		<constant name="LOOKUP_RESULT_MAX" value="11" enum="LookupResultType">
 		</constant>
 		<constant name="LOCATION_LOCAL" value="0" enum="CodeCompletionLocation">
 			The option is local to the location of the code completion query - e.g. a local variable. Subsequent value of location represent options from the outer class, the exact value represent how far they are (in terms of inner classes).
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index 64aa2ff8479e..014cb6cf31ff 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -34,6 +34,7 @@
 #include "core/core_constants.h"
 #include "core/extension/gdextension.h"
 #include "core/input/input.h"
+#include "core/io/json.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
@@ -589,11 +590,11 @@ void EditorHelp::_add_method(const DocData::MethodDoc &p_method, bool p_overview
 	}
 
 	if (is_vararg) {
-		class_desc->push_color(theme_cache.text_color);
 		if (!p_method.arguments.is_empty()) {
+			class_desc->push_color(theme_cache.text_color);
 			class_desc->add_text(", ");
+			class_desc->pop(); // color
 		}
-		class_desc->pop(); // color
 
 		class_desc->push_color(theme_cache.symbol_color);
 		class_desc->add_text("...");
@@ -2021,11 +2022,11 @@ void EditorHelp::_update_doc() {
 				}
 
 				if (annotation.qualifiers.contains("vararg")) {
-					class_desc->push_color(theme_cache.text_color);
 					if (!annotation.arguments.is_empty()) {
+						class_desc->push_color(theme_cache.text_color);
 						class_desc->add_text(", ");
+						class_desc->pop(); // color
 					}
-					class_desc->pop(); // color
 
 					class_desc->push_color(theme_cache.symbol_color);
 					class_desc->add_text("...");
@@ -2357,7 +2358,7 @@ void EditorHelp::_help_callback(const String &p_topic) {
 		if (annotation_line.has(name)) {
 			line = annotation_line[name];
 		}
-	} else if (what == "class_global") {
+	} else if (what == "class_global") { // Deprecated.
 		if (constant_line.has(name)) {
 			line = constant_line[name];
 		} else if (method_line.has(name)) {
@@ -3220,6 +3221,105 @@ EditorHelpBit::HelpData EditorHelpBit::_get_class_help_data(const StringName &p_
 	return result;
 }
 
+EditorHelpBit::HelpData EditorHelpBit::_get_enum_help_data(const StringName &p_class_name, const StringName &p_enum_name) {
+	if (doc_enum_cache.has(p_class_name) && doc_enum_cache[p_class_name].has(p_enum_name)) {
+		return doc_enum_cache[p_class_name][p_enum_name];
+	}
+
+	HelpData result;
+
+	const DocTools *dd = EditorHelp::get_doc_data();
+	const HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
+	if (E) {
+		// Non-native enums shouldn't be cached, nor translated.
+		const bool is_native = !E->value.is_script_doc;
+
+		for (const KeyValue<String, DocData::EnumDoc> &kv : E->value.enums) {
+			const StringName enum_name = kv.key;
+			const DocData::EnumDoc &enum_doc = kv.value;
+
+			HelpData current;
+			current.description = HANDLE_DOC(enum_doc.description);
+			if (enum_doc.is_deprecated) {
+				if (enum_doc.deprecated_message.is_empty()) {
+					current.deprecated_message = TTR("This enumeration may be changed or removed in future versions.");
+				} else {
+					current.deprecated_message = HANDLE_DOC(enum_doc.deprecated_message);
+				}
+			}
+			if (enum_doc.is_experimental) {
+				if (enum_doc.experimental_message.is_empty()) {
+					current.experimental_message = TTR("This enumeration may be changed or removed in future versions.");
+				} else {
+					current.experimental_message = HANDLE_DOC(enum_doc.experimental_message);
+				}
+			}
+
+			if (enum_name == p_enum_name) {
+				result = current;
+
+				if (!is_native) {
+					break;
+				}
+			}
+
+			if (is_native) {
+				doc_enum_cache[p_class_name][enum_name] = current;
+			}
+		}
+	}
+
+	return result;
+}
+
+EditorHelpBit::HelpData EditorHelpBit::_get_constant_help_data(const StringName &p_class_name, const StringName &p_constant_name) {
+	if (doc_constant_cache.has(p_class_name) && doc_constant_cache[p_class_name].has(p_constant_name)) {
+		return doc_constant_cache[p_class_name][p_constant_name];
+	}
+
+	HelpData result;
+
+	const DocTools *dd = EditorHelp::get_doc_data();
+	const HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
+	if (E) {
+		// Non-native constants shouldn't be cached, nor translated.
+		const bool is_native = !E->value.is_script_doc;
+
+		for (const DocData::ConstantDoc &constant : E->value.constants) {
+			HelpData current;
+			current.description = HANDLE_DOC(constant.description);
+			if (constant.is_deprecated) {
+				if (constant.deprecated_message.is_empty()) {
+					current.deprecated_message = TTR("This constant may be changed or removed in future versions.");
+				} else {
+					current.deprecated_message = HANDLE_DOC(constant.deprecated_message);
+				}
+			}
+			if (constant.is_experimental) {
+				if (constant.experimental_message.is_empty()) {
+					current.experimental_message = TTR("This constant may be changed or removed in future versions.");
+				} else {
+					current.experimental_message = HANDLE_DOC(constant.experimental_message);
+				}
+			}
+
+			if (constant.name == p_constant_name) {
+				result = current;
+
+				if (!is_native) {
+					break;
+				}
+			}
+
+			if (is_native) {
+				doc_constant_cache[p_class_name][constant.name] = current;
+			}
+		}
+	}
+
+	return result;
+}
+
 EditorHelpBit::HelpData EditorHelpBit::_get_property_help_data(const StringName &p_class_name, const StringName &p_property_name) {
 	if (doc_property_cache.has(p_class_name) && doc_property_cache[p_class_name].has(p_property_name)) {
 		return doc_property_cache[p_class_name][p_property_name];
@@ -3250,6 +3350,7 @@ EditorHelpBit::HelpData EditorHelpBit::_get_property_help_data(const StringName
 					current.experimental_message = HANDLE_DOC(property.experimental_message);
 				}
 			}
+			current.doc_type = { property.type, property.enumeration, property.is_bitfield };
 
 			String enum_class_name;
 			String enum_name;
@@ -3302,6 +3403,63 @@ EditorHelpBit::HelpData EditorHelpBit::_get_property_help_data(const StringName
 	return result;
 }
 
+EditorHelpBit::HelpData EditorHelpBit::_get_theme_item_help_data(const StringName &p_class_name, const StringName &p_theme_item_name) {
+	if (doc_theme_item_cache.has(p_class_name) && doc_theme_item_cache[p_class_name].has(p_theme_item_name)) {
+		return doc_theme_item_cache[p_class_name][p_theme_item_name];
+	}
+
+	HelpData result;
+
+	bool found = false;
+	const DocTools *dd = EditorHelp::get_doc_data();
+	HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
+	while (E) {
+		// Non-native theme items shouldn't be cached, nor translated.
+		const bool is_native = !E->value.is_script_doc;
+
+		for (const DocData::ThemeItemDoc &theme_item : E->value.theme_properties) {
+			HelpData current;
+			current.description = HANDLE_DOC(theme_item.description);
+			if (theme_item.is_deprecated) {
+				if (theme_item.deprecated_message.is_empty()) {
+					current.deprecated_message = TTR("This theme property may be changed or removed in future versions.");
+				} else {
+					current.deprecated_message = HANDLE_DOC(theme_item.deprecated_message);
+				}
+			}
+			if (theme_item.is_experimental) {
+				if (theme_item.experimental_message.is_empty()) {
+					current.experimental_message = TTR("This theme property may be changed or removed in future versions.");
+				} else {
+					current.experimental_message = HANDLE_DOC(theme_item.experimental_message);
+				}
+			}
+
+			if (theme_item.name == p_theme_item_name) {
+				result = current;
+				found = true;
+
+				if (!is_native) {
+					break;
+				}
+			}
+
+			if (is_native) {
+				doc_theme_item_cache[p_class_name][theme_item.name] = current;
+			}
+		}
+
+		if (found || E->value.inherits.is_empty()) {
+			break;
+		}
+
+		// Check for inherited theme items.
+		E = dd->class_list.find(E->value.inherits);
+	}
+
+	return result;
+}
+
 EditorHelpBit::HelpData EditorHelpBit::_get_method_help_data(const StringName &p_class_name, const StringName &p_method_name) {
 	if (doc_method_cache.has(p_class_name) && doc_method_cache[p_class_name].has(p_method_name)) {
 		return doc_method_cache[p_class_name][p_method_name];
@@ -3332,6 +3490,7 @@ EditorHelpBit::HelpData EditorHelpBit::_get_method_help_data(const StringName &p
 				}
 			}
 			current.doc_type = { method.return_type, method.return_enum, method.return_is_bitfield };
+			current.qualifiers = method.qualifiers;
 			for (const DocData::ArgumentDoc &argument : method.arguments) {
 				const DocType argument_type = { argument.type, argument.enumeration, argument.is_bitfield };
 				current.arguments.push_back({ argument.name, argument_type, argument.default_value });
@@ -3383,6 +3542,7 @@ EditorHelpBit::HelpData EditorHelpBit::_get_signal_help_data(const StringName &p
 					current.experimental_message = HANDLE_DOC(signal.experimental_message);
 				}
 			}
+			current.qualifiers = signal.qualifiers;
 			for (const DocData::ArgumentDoc &argument : signal.arguments) {
 				const DocType argument_type = { argument.type, argument.enumeration, argument.is_bitfield };
 				current.arguments.push_back({ argument.name, argument_type, argument.default_value });
@@ -3405,41 +3565,43 @@ EditorHelpBit::HelpData EditorHelpBit::_get_signal_help_data(const StringName &p
 	return result;
 }
 
-EditorHelpBit::HelpData EditorHelpBit::_get_theme_item_help_data(const StringName &p_class_name, const StringName &p_theme_item_name) {
-	if (doc_theme_item_cache.has(p_class_name) && doc_theme_item_cache[p_class_name].has(p_theme_item_name)) {
-		return doc_theme_item_cache[p_class_name][p_theme_item_name];
+EditorHelpBit::HelpData EditorHelpBit::_get_annotation_help_data(const StringName &p_class_name, const StringName &p_annotation_name) {
+	if (doc_annotation_cache.has(p_class_name) && doc_annotation_cache[p_class_name].has(p_annotation_name)) {
+		return doc_annotation_cache[p_class_name][p_annotation_name];
 	}
 
 	HelpData result;
 
-	bool found = false;
-	const DocTools *dd = EditorHelp::get_doc_data();
-	HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
-	while (E) {
-		// Non-native theme items shouldn't be cached, nor translated.
+	const HashMap<String, DocData::ClassDoc>::ConstIterator E = EditorHelp::get_doc_data()->class_list.find(p_class_name);
+	if (E) {
+		// Non-native annotations shouldn't be cached, nor translated.
 		const bool is_native = !E->value.is_script_doc;
 
-		for (const DocData::ThemeItemDoc &theme_item : E->value.theme_properties) {
+		for (const DocData::MethodDoc &annotation : E->value.annotations) {
 			HelpData current;
-			current.description = HANDLE_DOC(theme_item.description);
-			if (theme_item.is_deprecated) {
-				if (theme_item.deprecated_message.is_empty()) {
-					current.deprecated_message = TTR("This theme property may be changed or removed in future versions.");
+			current.description = HANDLE_DOC(annotation.description);
+			if (annotation.is_deprecated) {
+				if (annotation.deprecated_message.is_empty()) {
+					current.deprecated_message = TTR("This annotation may be changed or removed in future versions.");
 				} else {
-					current.deprecated_message = HANDLE_DOC(theme_item.deprecated_message);
+					current.deprecated_message = HANDLE_DOC(annotation.deprecated_message);
 				}
 			}
-			if (theme_item.is_experimental) {
-				if (theme_item.experimental_message.is_empty()) {
-					current.experimental_message = TTR("This theme property may be changed or removed in future versions.");
+			if (annotation.is_experimental) {
+				if (annotation.experimental_message.is_empty()) {
+					current.experimental_message = TTR("This annotation may be changed or removed in future versions.");
 				} else {
-					current.experimental_message = HANDLE_DOC(theme_item.experimental_message);
+					current.experimental_message = HANDLE_DOC(annotation.experimental_message);
 				}
 			}
+			current.qualifiers = annotation.qualifiers;
+			for (const DocData::ArgumentDoc &argument : annotation.arguments) {
+				const DocType argument_type = { argument.type, argument.enumeration, argument.is_bitfield };
+				current.arguments.push_back({ argument.name, argument_type, argument.default_value });
+			}
 
-			if (theme_item.name == p_theme_item_name) {
+			if (annotation.name == p_annotation_name) {
 				result = current;
-				found = true;
 
 				if (!is_native) {
 					break;
@@ -3447,16 +3609,9 @@ EditorHelpBit::HelpData EditorHelpBit::_get_theme_item_help_data(const StringNam
 			}
 
 			if (is_native) {
-				doc_theme_item_cache[p_class_name][theme_item.name] = current;
+				doc_annotation_cache[p_class_name][annotation.name] = current;
 			}
 		}
-
-		if (found || E->value.inherits.is_empty()) {
-			break;
-		}
-
-		// Check for inherited theme items.
-		E = dd->class_list.find(E->value.inherits);
 	}
 
 	return result;
@@ -3494,12 +3649,26 @@ void EditorHelpBit::_update_labels() {
 
 		title->pop(); // font
 
-		if (symbol_type == "method" || symbol_type == "signal") {
-			const Color symbol_color = get_theme_color(SNAME("symbol_color"), SNAME("EditorHelp"));
-			const Color value_color = get_theme_color(SNAME("value_color"), SNAME("EditorHelp"));
+		const Color symbol_color = get_theme_color(SNAME("symbol_color"), SNAME("EditorHelp"));
+		const Color value_color = get_theme_color(SNAME("value_color"), SNAME("EditorHelp"));
+		const Ref<Font> doc_source = get_theme_font(SNAME("doc_source"), EditorStringName(EditorFonts));
+		const int doc_source_size = get_theme_font_size(SNAME("doc_source_size"), EditorStringName(EditorFonts));
+
+		if (symbol_type == "property" || symbol_type == "internal_property" || symbol_type == "local_constant" || symbol_type == "local_variable") {
+			title->push_font(doc_source);
+			title->push_font_size(doc_source_size * 0.9);
+
+			title->push_color(symbol_color);
+			title->add_text(": ");
+			title->pop(); // color
+
+			_add_type_to_title(help_data.doc_type);
 
-			title->push_font(get_theme_font(SNAME("doc_source"), EditorStringName(EditorFonts)));
-			title->push_font_size(get_theme_font_size(SNAME("doc_source_size"), EditorStringName(EditorFonts)) * 0.9);
+			title->pop(); // font_size
+			title->pop(); // font
+		} else if (symbol_type == "method" || symbol_type == "signal" || symbol_type == "annotation") {
+			title->push_font(doc_source);
+			title->push_font_size(doc_source_size * 0.9);
 
 			title->push_color(symbol_color);
 			title->add_text("(");
@@ -3509,9 +3678,7 @@ void EditorHelpBit::_update_labels() {
 				const ArgumentData &argument = help_data.arguments[i];
 
 				if (i > 0) {
-					title->push_color(symbol_color);
 					title->add_text(", ");
-					title->pop(); // color
 				}
 
 				title->add_text(argument.name);
@@ -3533,6 +3700,16 @@ void EditorHelpBit::_update_labels() {
 				}
 			}
 
+			if (help_data.qualifiers.contains("vararg")) {
+				if (!help_data.arguments.is_empty()) {
+					title->add_text(", ");
+				}
+
+				title->push_color(symbol_color);
+				title->add_text("...");
+				title->pop(); // color
+			}
+
 			title->push_color(symbol_color);
 			title->add_text(")");
 			title->pop(); // color
@@ -3691,45 +3868,90 @@ void EditorHelpBit::_notification(int p_what) {
 }
 
 void EditorHelpBit::parse_symbol(const String &p_symbol) {
-	const PackedStringArray slices = p_symbol.split("|", true, 2);
-	ERR_FAIL_COND_MSG(slices.size() < 3, "Invalid doc id. The expected format is 'item_type|class_name|item_name'.");
+	const PackedStringArray slices = p_symbol.split("|", true, 3);
+	ERR_FAIL_COND_MSG(slices.size() < 3, "Invalid doc id: The expected format is \"item_type|class_name|item_name[|item_data]\".");
 
 	const String &item_type = slices[0];
 	const String &class_name = slices[1];
 	const String &item_name = slices[2];
 
+	Dictionary item_data;
+	if (slices.size() > 3) {
+		item_data = JSON::parse_string(slices[3]);
+	}
+
 	String visible_type;
 	String name = item_name;
 
 	if (item_type == "class") {
-		visible_type = TTR("Class:");
+		visible_type = TTR("Class");
 		name = class_name;
 		help_data = _get_class_help_data(class_name);
+	} else if (item_type == "enum") {
+		visible_type = TTR("Enumeration");
+		help_data = _get_enum_help_data(class_name, item_name);
+	} else if (item_type == "constant") {
+		visible_type = TTR("Constant");
+		help_data = _get_constant_help_data(class_name, item_name);
 	} else if (item_type == "property") {
 		if (name.begins_with("metadata/")) {
-			visible_type = TTR("Metadata:");
+			visible_type = TTR("Metadata");
 			name = name.trim_prefix("metadata/");
 		} else if (class_name == "ProjectSettings" || class_name == "EditorSettings") {
-			visible_type = TTR("Setting:");
+			visible_type = TTR("Setting");
 		} else {
-			visible_type = TTR("Property:");
+			visible_type = TTR("Property");
 		}
 		help_data = _get_property_help_data(class_name, item_name);
 	} else if (item_type == "internal_property") {
-		visible_type = TTR("Internal Property:");
+		visible_type = TTR("Internal Property");
 		help_data = HelpData();
 		help_data.description = "[color=<EditorHelpBitCommentColor>][i]" + TTR("This property can only be set in the Inspector.") + "[/i][/color]";
+	} else if (item_type == "theme_item") {
+		visible_type = TTR("Theme Property");
+		help_data = _get_theme_item_help_data(class_name, item_name);
 	} else if (item_type == "method") {
-		visible_type = TTR("Method:");
+		visible_type = TTR("Method");
 		help_data = _get_method_help_data(class_name, item_name);
 	} else if (item_type == "signal") {
-		visible_type = TTR("Signal:");
+		visible_type = TTR("Signal");
 		help_data = _get_signal_help_data(class_name, item_name);
-	} else if (item_type == "theme_item") {
-		visible_type = TTR("Theme Property:");
-		help_data = _get_theme_item_help_data(class_name, item_name);
+	} else if (item_type == "annotation") {
+		visible_type = TTR("Annotation");
+		help_data = _get_annotation_help_data(class_name, item_name);
+	} else if (item_type == "local_constant" || item_type == "local_variable") {
+		visible_type = (item_type == "local_constant") ? TTR("Local Constant") : TTR("Local Variable");
+		help_data = HelpData();
+		help_data.description = item_data.get("description", "").operator String().strip_edges();
+		if (item_data.get("is_deprecated", false)) {
+			const String deprecated_message = item_data.get("deprecated_message", "").operator String().strip_edges();
+			if (deprecated_message.is_empty()) {
+				if (item_type == "local_constant") {
+					help_data.deprecated_message = TTR("This constant may be changed or removed in future versions.");
+				} else {
+					help_data.deprecated_message = TTR("This variable may be changed or removed in future versions.");
+				}
+			} else {
+				help_data.deprecated_message = deprecated_message;
+			}
+		}
+		if (item_data.get("is_experimental", false)) {
+			const String experimental_message = item_data.get("experimental_message", "").operator String().strip_edges();
+			if (experimental_message.is_empty()) {
+				if (item_type == "local_constant") {
+					help_data.experimental_message = TTR("This constant may be changed or removed in future versions.");
+				} else {
+					help_data.experimental_message = TTR("This variable may be changed or removed in future versions.");
+				}
+			} else {
+				help_data.experimental_message = experimental_message;
+			}
+		}
+		help_data.doc_type.type = item_data.get("doc_type", "");
+		help_data.doc_type.enumeration = item_data.get("enumeration", "");
+		help_data.doc_type.is_bitfield = item_data.get("is_bitfield", false);
 	} else {
-		ERR_FAIL_MSG("Invalid tooltip type '" + item_type + "'. Valid types are 'class', 'property', 'internal_property', 'method', 'signal', and 'theme_item'.");
+		ERR_FAIL_MSG("Invalid doc id: Unknown item type " + item_type.quote() + ".");
 	}
 
 	symbol_class_name = class_name;
diff --git a/editor/editor_help.h b/editor/editor_help.h
index 93f74cb2c123..b00505ed9e4f 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -270,15 +270,19 @@ class EditorHelpBit : public VBoxContainer {
 		String description;
 		String deprecated_message;
 		String experimental_message;
-		DocType doc_type; // For method return type.
-		Vector<ArgumentData> arguments; // For methods and signals.
+		DocType doc_type; // For property type and method return type.
+		String qualifiers; // For methods, signals, and annotations.
+		Vector<ArgumentData> arguments; // For methods, signals, and annotations.
 	};
 
 	inline static HashMap<StringName, HelpData> doc_class_cache;
+	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_enum_cache;
+	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_constant_cache;
 	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_property_cache;
+	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_theme_item_cache;
 	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_method_cache;
 	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_signal_cache;
-	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_theme_item_cache;
+	inline static HashMap<StringName, HashMap<StringName, HelpData>> doc_annotation_cache;
 
 	RichTextLabel *title = nullptr;
 	RichTextLabel *content = nullptr;
@@ -294,10 +298,13 @@ class EditorHelpBit : public VBoxContainer {
 	float content_max_height = 0.0;
 
 	static HelpData _get_class_help_data(const StringName &p_class_name);
+	static HelpData _get_enum_help_data(const StringName &p_class_name, const StringName &p_enum_name);
+	static HelpData _get_constant_help_data(const StringName &p_class_name, const StringName &p_constant_name);
 	static HelpData _get_property_help_data(const StringName &p_class_name, const StringName &p_property_name);
+	static HelpData _get_theme_item_help_data(const StringName &p_class_name, const StringName &p_theme_item_name);
 	static HelpData _get_method_help_data(const StringName &p_class_name, const StringName &p_method_name);
 	static HelpData _get_signal_help_data(const StringName &p_class_name, const StringName &p_signal_name);
-	static HelpData _get_theme_item_help_data(const StringName &p_class_name, const StringName &p_theme_item_name);
+	static HelpData _get_annotation_help_data(const StringName &p_class_name, const StringName &p_annotation_name);
 
 	void _add_type_to_title(const DocType &p_doc_type);
 	void _update_labels();
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index f936a06e20e1..e2dfc8dedbe7 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -3005,24 +3005,14 @@ void EditorInspector::update_tree() {
 				category_label = p.name;
 
 				// Use category's owner script to update some of its information.
-				if (!EditorNode::get_editor_data().is_type_recognized(p.name) && ResourceLoader::exists(p.hint_string)) {
+				if (!EditorNode::get_editor_data().is_type_recognized(p.name) && ResourceLoader::exists(p.hint_string, "Script")) {
 					Ref<Script> scr = ResourceLoader::load(p.hint_string, "Script");
 					if (scr.is_valid()) {
-						StringName script_name = EditorNode::get_editor_data().script_class_get_name(scr->get_path());
+						doc_name = scr->get_doc_class_name();
 
-						// Update the docs reference and the label based on the script.
-						Vector<DocData::ClassDoc> docs = scr->get_documentation();
-						if (!docs.is_empty()) {
-							// The documentation of a GDScript's main class is at the end of the array.
-							// Hacky because this isn't necessarily always guaranteed.
-							doc_name = docs[docs.size() - 1].name;
-						}
+						StringName script_name = EditorNode::get_editor_data().script_class_get_name(scr->get_path());
 						if (script_name != StringName()) {
 							category_label = script_name;
-						}
-
-						// Find the icon corresponding to the script.
-						if (script_name != StringName()) {
 							category_icon = EditorNode::get_singleton()->get_class_icon(script_name);
 						} else {
 							category_icon = EditorNode::get_singleton()->get_object_icon(scr.ptr(), "Object");
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index a28d709b150d..a8f13909d7be 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -31,10 +31,12 @@
 #include "script_text_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/json.h"
 #include "core/math/expression.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_command_palette.h"
+#include "editor/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
@@ -968,7 +970,9 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c
 		_goto_line(p_row);
 
 		switch (result.type) {
-			case ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION: {
+			case ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION:
+			case ScriptLanguage::LOOKUP_RESULT_LOCAL_CONSTANT:
+			case ScriptLanguage::LOOKUP_RESULT_LOCAL_VARIABLE: {
 				if (result.script.is_valid()) {
 					emit_signal(SNAME("request_open_script_at_line"), result.script, result.location - 1);
 				} else {
@@ -981,78 +985,68 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c
 			} break;
 			case ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT: {
 				StringName cname = result.class_name;
-				bool success;
-				while (true) {
-					ClassDB::get_integer_constant(cname, result.class_member, &success);
-					if (success) {
+				while (ClassDB::class_exists(cname)) {
+					if (ClassDB::has_integer_constant(cname, result.class_member, true)) {
 						result.class_name = cname;
-						cname = ClassDB::get_parent_class(cname);
-					} else {
 						break;
 					}
+					cname = ClassDB::get_parent_class(cname);
 				}
-
 				emit_signal(SNAME("go_to_help"), "class_constant:" + result.class_name + ":" + result.class_member);
-
 			} break;
 			case ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY: {
+				StringName cname = result.class_name;
+				while (ClassDB::class_exists(cname)) {
+					if (ClassDB::has_property(cname, result.class_member, true)) {
+						result.class_name = cname;
+						break;
+					}
+					cname = ClassDB::get_parent_class(cname);
+				}
 				emit_signal(SNAME("go_to_help"), "class_property:" + result.class_name + ":" + result.class_member);
-
 			} break;
 			case ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD: {
 				StringName cname = result.class_name;
-
-				while (true) {
-					if (ClassDB::has_method(cname, result.class_member)) {
+				while (ClassDB::class_exists(cname)) {
+					if (ClassDB::has_method(cname, result.class_member, true)) {
 						result.class_name = cname;
-						cname = ClassDB::get_parent_class(cname);
-					} else {
 						break;
 					}
+					cname = ClassDB::get_parent_class(cname);
 				}
-
 				emit_signal(SNAME("go_to_help"), "class_method:" + result.class_name + ":" + result.class_member);
-
 			} break;
 			case ScriptLanguage::LOOKUP_RESULT_CLASS_SIGNAL: {
 				StringName cname = result.class_name;
-
-				while (true) {
-					if (ClassDB::has_signal(cname, result.class_member)) {
+				while (ClassDB::class_exists(cname)) {
+					if (ClassDB::has_signal(cname, result.class_member, true)) {
 						result.class_name = cname;
-						cname = ClassDB::get_parent_class(cname);
-					} else {
 						break;
 					}
+					cname = ClassDB::get_parent_class(cname);
 				}
-
 				emit_signal(SNAME("go_to_help"), "class_signal:" + result.class_name + ":" + result.class_member);
-
 			} break;
 			case ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM: {
 				StringName cname = result.class_name;
-				StringName success;
-				while (true) {
-					success = ClassDB::get_integer_constant_enum(cname, result.class_member, true);
-					if (success != StringName()) {
+				while (ClassDB::class_exists(cname)) {
+					if (ClassDB::has_enum(cname, result.class_member, true)) {
 						result.class_name = cname;
-						cname = ClassDB::get_parent_class(cname);
-					} else {
 						break;
 					}
+					cname = ClassDB::get_parent_class(cname);
 				}
-
 				emit_signal(SNAME("go_to_help"), "class_enum:" + result.class_name + ":" + result.class_member);
-
 			} break;
 			case ScriptLanguage::LOOKUP_RESULT_CLASS_ANNOTATION: {
 				emit_signal(SNAME("go_to_help"), "class_annotation:" + result.class_name + ":" + result.class_member);
 			} break;
-			case ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE: {
+			case ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE: { // Deprecated.
 				emit_signal(SNAME("go_to_help"), "class_global:" + result.class_name + ":" + result.class_member);
 			} break;
-			default: {
-			}
+			case ScriptLanguage::LOOKUP_RESULT_MAX: {
+				// Nothing to do.
+			} break;
 		}
 	} else if (ProjectSettings::get_singleton()->has_autoload(p_symbol)) {
 		// Check for Autoload scenes.
@@ -1102,6 +1096,110 @@ void ScriptTextEditor::_validate_symbol(const String &p_symbol) {
 	}
 }
 
+void ScriptTextEditor::_show_symbol_tooltip(const String &p_symbol, int p_row, int p_column) {
+	Node *base = get_tree()->get_edited_scene_root();
+	if (base) {
+		base = _find_node_for_script(base, base, script);
+	}
+
+	ScriptLanguage::LookupResult result;
+	const String code_text = code_editor->get_text_editor()->get_text_with_cursor_char(p_row, p_column);
+	const Error lc_error = script->get_language()->lookup_code(code_text, p_symbol, script->get_path(), base, result);
+	if (lc_error != OK) {
+		return;
+	}
+
+	String doc_symbol;
+	switch (result.type) {
+		case ScriptLanguage::LOOKUP_RESULT_CLASS: {
+			doc_symbol = "class|" + result.class_name + "|";
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT: {
+			StringName cname = result.class_name;
+			while (ClassDB::class_exists(cname)) {
+				if (ClassDB::has_integer_constant(cname, result.class_member, true)) {
+					result.class_name = cname;
+					break;
+				}
+				cname = ClassDB::get_parent_class(cname);
+			}
+			doc_symbol = "constant|" + result.class_name + "|" + result.class_member;
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY: {
+			StringName cname = result.class_name;
+			while (ClassDB::class_exists(cname)) {
+				if (ClassDB::has_property(cname, result.class_member, true)) {
+					result.class_name = cname;
+					break;
+				}
+				cname = ClassDB::get_parent_class(cname);
+			}
+			doc_symbol = "property|" + result.class_name + "|" + result.class_member;
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD: {
+			StringName cname = result.class_name;
+			while (ClassDB::class_exists(cname)) {
+				if (ClassDB::has_method(cname, result.class_member, true)) {
+					result.class_name = cname;
+					break;
+				}
+				cname = ClassDB::get_parent_class(cname);
+			}
+			doc_symbol = "method|" + result.class_name + "|" + result.class_member;
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_SIGNAL: {
+			StringName cname = result.class_name;
+			while (ClassDB::class_exists(cname)) {
+				if (ClassDB::has_signal(cname, result.class_member, true)) {
+					result.class_name = cname;
+					break;
+				}
+				cname = ClassDB::get_parent_class(cname);
+			}
+			doc_symbol = "signal|" + result.class_name + "|" + result.class_member;
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM: {
+			StringName cname = result.class_name;
+			while (ClassDB::class_exists(cname)) {
+				if (ClassDB::has_enum(cname, result.class_member, true)) {
+					result.class_name = cname;
+					break;
+				}
+				cname = ClassDB::get_parent_class(cname);
+			}
+			doc_symbol = "enum|" + result.class_name + "|" + result.class_member;
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_ANNOTATION: {
+			doc_symbol = "annotation|" + result.class_name + "|" + result.class_member;
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_LOCAL_CONSTANT:
+		case ScriptLanguage::LOOKUP_RESULT_LOCAL_VARIABLE: {
+			const String item_type = (result.type == ScriptLanguage::LOOKUP_RESULT_LOCAL_CONSTANT) ? "local_constant" : "local_variable";
+			Dictionary item_data;
+			item_data["description"] = result.description;
+			item_data["is_deprecated"] = result.is_deprecated;
+			item_data["deprecated_message"] = result.deprecated_message;
+			item_data["is_experimental"] = result.is_experimental;
+			item_data["experimental_message"] = result.experimental_message;
+			item_data["doc_type"] = result.doc_type;
+			item_data["enumeration"] = result.enumeration;
+			item_data["is_bitfield"] = result.is_bitfield;
+			doc_symbol = item_type + "||" + p_symbol + "|" + JSON::stringify(item_data);
+		} break;
+		case ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION:
+		case ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE: // Deprecated.
+		case ScriptLanguage::LOOKUP_RESULT_MAX: {
+			// Nothing to do.
+		} break;
+	}
+
+	if (!doc_symbol.is_empty()) {
+		EditorHelpBit *help_bit = memnew(EditorHelpBit(doc_symbol));
+		EditorHelpBitTooltip::show_tooltip(help_bit, this);
+		return;
+	}
+}
+
 String ScriptTextEditor::_get_absolute_path(const String &rel_path) {
 	String base_path = script->get_path().get_base_dir();
 	String path = base_path.path_join(rel_path);
@@ -2235,6 +2333,7 @@ void ScriptTextEditor::_enable_code_editor() {
 	code_editor->connect("validate_script", callable_mp(this, &ScriptTextEditor::_validate_script));
 	code_editor->connect("load_theme_settings", callable_mp(this, &ScriptTextEditor::_load_theme_settings));
 	code_editor->get_text_editor()->connect("symbol_lookup", callable_mp(this, &ScriptTextEditor::_lookup_symbol));
+	code_editor->get_text_editor()->connect("symbol_hovered", callable_mp(this, &ScriptTextEditor::_show_symbol_tooltip));
 	code_editor->get_text_editor()->connect("symbol_validate", callable_mp(this, &ScriptTextEditor::_validate_symbol));
 	code_editor->get_text_editor()->connect("gutter_added", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
 	code_editor->get_text_editor()->connect("gutter_removed", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
@@ -2411,6 +2510,7 @@ ScriptTextEditor::ScriptTextEditor() {
 	update_settings();
 
 	code_editor->get_text_editor()->set_symbol_lookup_on_click_enabled(true);
+	code_editor->get_text_editor()->set_symbol_tooltip_on_hover_enabled(true);
 	code_editor->get_text_editor()->set_context_menu_enabled(false);
 
 	context_menu = memnew(PopupMenu);
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index 7aa0726479f5..000fc466d710 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -200,6 +200,8 @@ class ScriptTextEditor : public ScriptEditorBase {
 	void _lookup_symbol(const String &p_symbol, int p_row, int p_column);
 	void _validate_symbol(const String &p_symbol);
 
+	void _show_symbol_tooltip(const String &p_symbol, int p_row, int p_column);
+
 	void _convert_case(CodeTextEditor::CaseStyle p_case);
 
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
diff --git a/modules/gdscript/editor/gdscript_docgen.cpp b/modules/gdscript/editor/gdscript_docgen.cpp
index a6742820b579..c3bf711dfbfa 100644
--- a/modules/gdscript/editor/gdscript_docgen.cpp
+++ b/modules/gdscript/editor/gdscript_docgen.cpp
@@ -570,3 +570,14 @@ void GDScriptDocGen::generate_docs(GDScript *p_script, const GDP::ClassNode *p_c
 	_generate_docs(p_script, p_class);
 	singletons.clear();
 }
+
+// This method is needed for the editor, since during autocompletion the script is not compiled, only analyzed.
+void GDScriptDocGen::doctype_from_gdtype(const GDType &p_gdtype, String &r_type, String &r_enum, bool p_is_return) {
+	for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : ProjectSettings::get_singleton()->get_autoload_list()) {
+		if (E.value.is_singleton) {
+			singletons[E.value.path] = E.key;
+		}
+	}
+	_doctype_from_gdtype(p_gdtype, r_type, r_enum, p_is_return);
+	singletons.clear();
+}
diff --git a/modules/gdscript/editor/gdscript_docgen.h b/modules/gdscript/editor/gdscript_docgen.h
index 0ae37c413302..74f9aec7795a 100644
--- a/modules/gdscript/editor/gdscript_docgen.h
+++ b/modules/gdscript/editor/gdscript_docgen.h
@@ -50,6 +50,7 @@ class GDScriptDocGen {
 
 public:
 	static void generate_docs(GDScript *p_script, const GDP::ClassNode *p_class);
+	static void doctype_from_gdtype(const GDType &p_gdtype, String &r_type, String &r_enum, bool p_is_return = false);
 };
 
 #endif // GDSCRIPT_DOCGEN_H
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index a638adeaee99..3d718b29fc16 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -479,23 +479,25 @@ void GDScript::_update_exports_values(HashMap<StringName, Variant> &values, List
 	}
 }
 
-void GDScript::_add_doc(const DocData::ClassDoc &p_inner_class) {
-	if (_owner) { // Only the top-level class stores doc info
-		_owner->_add_doc(p_inner_class);
-	} else { // Remove old docs, add new
+void GDScript::_add_doc(const DocData::ClassDoc &p_doc) {
+	doc_class_name = p_doc.name;
+	if (_owner) { // Only the top-level class stores doc info.
+		_owner->_add_doc(p_doc);
+	} else { // Remove old docs, add new.
 		for (int i = 0; i < docs.size(); i++) {
-			if (docs[i].name == p_inner_class.name) {
+			if (docs[i].name == p_doc.name) {
 				docs.remove_at(i);
 				break;
 			}
 		}
-		docs.append(p_inner_class);
+		docs.append(p_doc);
 	}
 }
 
 void GDScript::_clear_doc() {
-	docs.clear();
+	doc_class_name = StringName();
 	doc = DocData::ClassDoc();
+	docs.clear();
 }
 
 String GDScript::get_class_icon_path() const {
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index 006a09debbb8..3848f7d5c912 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -157,10 +157,11 @@ class GDScript : public Script {
 	bool placeholder_fallback_enabled = false;
 	void _update_exports_values(HashMap<StringName, Variant> &values, List<PropertyInfo> &propnames);
 
+	StringName doc_class_name;
 	DocData::ClassDoc doc;
 	Vector<DocData::ClassDoc> docs;
+	void _add_doc(const DocData::ClassDoc &p_doc);
 	void _clear_doc();
-	void _add_doc(const DocData::ClassDoc &p_inner_class);
 #endif
 
 	GDScriptFunction *implicit_initializer = nullptr;
@@ -292,9 +293,8 @@ class GDScript : public Script {
 	virtual void update_exports() override;
 
 #ifdef TOOLS_ENABLED
-	virtual Vector<DocData::ClassDoc> get_documentation() const override {
-		return docs;
-	}
+	virtual StringName get_doc_class_name() const override { return doc_class_name; }
+	virtual Vector<DocData::ClassDoc> get_documentation() const override { return docs; }
 	virtual String get_class_icon_path() const override;
 #endif // TOOLS_ENABLED
 
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index ecaf424091a6..8ac19f1f58bc 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -37,6 +37,7 @@
 #include "gdscript_utility_functions.h"
 
 #ifdef TOOLS_ENABLED
+#include "editor/gdscript_docgen.h"
 #include "editor/script_templates/templates.gen.h"
 #endif
 
@@ -3668,11 +3669,47 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 						name = "_init";
 					}
 					if (base_type.class_type->has_member(name)) {
-						r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
-						r_result.location = base_type.class_type->get_member(name).get_line();
-						r_result.class_path = base_type.script_path;
+						switch (base_type.class_type->get_member(name).type) {
+							case GDScriptParser::ClassNode::Member::UNDEFINED:
+							case GDScriptParser::ClassNode::Member::GROUP:
+								return ERR_BUG;
+							case GDScriptParser::ClassNode::Member::CLASS:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
+								break;
+							case GDScriptParser::ClassNode::Member::CONSTANT:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
+								break;
+							case GDScriptParser::ClassNode::Member::FUNCTION:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
+								break;
+							case GDScriptParser::ClassNode::Member::SIGNAL:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_SIGNAL;
+								break;
+							case GDScriptParser::ClassNode::Member::VARIABLE:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY;
+								break;
+							case GDScriptParser::ClassNode::Member::ENUM:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM;
+								break;
+							case GDScriptParser::ClassNode::Member::ENUM_VALUE:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
+								break;
+						}
+
+						String doc_type;
+						String doc_enum;
+						GDScriptDocGen::doctype_from_gdtype(base_type, doc_type, doc_enum);
+
+						if (!doc_enum.is_empty()) {
+							doc_type = doc_enum.trim_suffix("." + name);
+						}
+
 						Error err = OK;
-						r_result.script = GDScriptCache::get_shallow_script(r_result.class_path, err);
+						r_result.class_name = doc_type;
+						r_result.class_member = name;
+						r_result.script = GDScriptCache::get_shallow_script(base_type.script_path, err);
+						r_result.script_path = base_type.script_path;
+						r_result.location = base_type.class_type->get_member(name).get_line();
 						return err;
 					}
 					base_type = base_type.class_type->base_type;
@@ -3683,9 +3720,51 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 				if (scr.is_valid()) {
 					int line = scr->get_member_line(p_symbol);
 					if (line >= 0) {
+						bool found = false;
 						r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
-						r_result.location = line;
+						{
+							List<PropertyInfo> properties;
+							scr->get_script_property_list(&properties);
+							for (const PropertyInfo &property : properties) {
+								if (property.name == p_symbol && (property.usage & PROPERTY_USAGE_SCRIPT_VARIABLE)) {
+									found = true;
+									r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY;
+									r_result.class_name = scr->get_doc_class_name();
+									r_result.class_member = p_symbol;
+									break;
+								}
+							}
+						}
+						if (!found) {
+							List<MethodInfo> methods;
+							scr->get_script_method_list(&methods);
+							for (const MethodInfo &method : methods) {
+								if (method.name == p_symbol) {
+									found = true;
+									r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
+									r_result.class_name = scr->get_doc_class_name();
+									r_result.class_member = p_symbol;
+									break;
+								}
+							}
+						}
+						if (!found) {
+							List<MethodInfo> signals;
+							scr->get_script_method_list(&signals);
+							for (const MethodInfo &signal : signals) {
+								if (signal.name == p_symbol) {
+									found = true;
+									r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_SIGNAL;
+									r_result.class_name = scr->get_doc_class_name();
+									r_result.class_member = p_symbol;
+									break;
+								}
+							}
+						}
+						// TODO: Constants, enums, inner classes (?).
 						r_result.script = scr;
+						r_result.script_path = base_type.script_path;
+						r_result.location = line;
 						return OK;
 					}
 					Ref<Script> base_script = scr->get_base_script();
@@ -3825,11 +3904,11 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 					GDScriptParser::EnumNode *base_enum = base_type.class_type->get_member(base_type.enum_type).m_enum;
 					for (const GDScriptParser::EnumNode::Value &value : base_enum->values) {
 						if (value.identifier && value.identifier->name == p_symbol) {
-							r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
-							r_result.class_path = base_type.script_path;
-							r_result.location = value.line;
 							Error err = OK;
-							r_result.script = GDScriptCache::get_shallow_script(r_result.class_path, err);
+							r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM;
+							r_result.script = GDScriptCache::get_shallow_script(base_type.script_path, err);
+							r_result.script_path = base_type.script_path;
+							r_result.location = value.line;
 							return err;
 						}
 					}
@@ -3993,8 +4072,38 @@ ::Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symb
 				const GDScriptParser::SuiteNode *suite = context.current_suite;
 				while (suite) {
 					if (suite->has_local(p_symbol)) {
-						r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
-						r_result.location = suite->get_local(p_symbol).start_line;
+						const GDScriptParser::SuiteNode::Local &local = suite->get_local(p_symbol);
+						switch (local.type) {
+							case GDScriptParser::SuiteNode::Local::UNDEFINED:
+								return ERR_BUG;
+							case GDScriptParser::SuiteNode::Local::CONSTANT:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_LOCAL_CONSTANT;
+								r_result.description = local.constant->doc_data.description;
+								r_result.is_deprecated = local.constant->doc_data.is_deprecated;
+								r_result.deprecated_message = local.constant->doc_data.deprecated_message;
+								r_result.is_experimental = local.constant->doc_data.is_experimental;
+								r_result.experimental_message = local.constant->doc_data.experimental_message;
+								break;
+							case GDScriptParser::SuiteNode::Local::VARIABLE:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_LOCAL_VARIABLE;
+								r_result.description = local.variable->doc_data.description;
+								r_result.is_deprecated = local.variable->doc_data.is_deprecated;
+								r_result.deprecated_message = local.variable->doc_data.deprecated_message;
+								r_result.is_experimental = local.variable->doc_data.is_experimental;
+								r_result.experimental_message = local.variable->doc_data.experimental_message;
+								break;
+							case GDScriptParser::SuiteNode::Local::PARAMETER:
+							case GDScriptParser::SuiteNode::Local::FOR_VARIABLE:
+							case GDScriptParser::SuiteNode::Local::PATTERN_BIND:
+								r_result.type = ScriptLanguage::LOOKUP_RESULT_LOCAL_VARIABLE;
+								break;
+						}
+
+						GDScriptDocGen::doctype_from_gdtype(local.get_datatype(), r_result.doc_type, r_result.enumeration);
+
+						r_result.script = base_type.script_type;
+						r_result.script_path = base_type.script_path;
+						r_result.location = local.start_line;
 						return OK;
 					}
 					suite = suite->parent_block;
@@ -4019,8 +4128,9 @@ ::Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symb
 
 						if (FileAccess::exists(scr_path)) {
 							r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
-							r_result.location = 0;
 							r_result.script = ResourceLoader::load(scr_path);
+							r_result.script_path = scr_path;
+							r_result.location = 0;
 							return OK;
 						}
 					}
@@ -4048,33 +4158,23 @@ ::Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symb
 							return OK;
 						}
 					} else {
-						/*
-						// Because get_integer_constant_enum and get_integer_constant don't work on @GlobalScope
-						// We cannot determine the exact nature of the identifier here
-						// Otherwise these codes would work
-						StringName enumName = ClassDB::get_integer_constant_enum("@GlobalScope", p_symbol, true);
-						if (enumName != nullptr) {
+						if (CoreConstants::is_global_enum(p_symbol)) {
 							r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM;
 							r_result.class_name = "@GlobalScope";
-							r_result.class_member = enumName;
+							r_result.class_member = p_symbol;
 							return OK;
-						}
-						else {
+						} else if (CoreConstants::is_global_constant(p_symbol)) {
 							r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
 							r_result.class_name = "@GlobalScope";
 							r_result.class_member = p_symbol;
 							return OK;
-						}*/
-						r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE;
-						r_result.class_name = "@GlobalScope";
-						r_result.class_member = p_symbol;
-						return OK;
+						}
 					}
 				} else {
 					List<StringName> utility_functions;
 					Variant::get_utility_function_list(&utility_functions);
 					if (utility_functions.find(p_symbol) != nullptr) {
-						r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE;
+						r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
 						r_result.class_name = "@GlobalScope";
 						r_result.class_member = p_symbol;
 						return OK;
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 12e71004dbde..e298d27ad658 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -1955,11 +1955,44 @@ GDScriptParser::Node *GDScriptParser::parse_statement() {
 		}
 	}
 
+#ifdef TOOLS_ENABLED
+	int doc_comment_line = 0;
+	if (result != nullptr) {
+		doc_comment_line = result->start_line - 1;
+	}
+#endif // TOOLS_ENABLED
+
 	if (result != nullptr && !annotations.is_empty()) {
 		for (AnnotationNode *&annotation : annotations) {
 			result->annotations.push_back(annotation);
+#ifdef TOOLS_ENABLED
+			if (annotation->start_line <= doc_comment_line) {
+				doc_comment_line = annotation->start_line - 1;
+			}
+#endif // TOOLS_ENABLED
+		}
+	}
+
+#ifdef TOOLS_ENABLED
+	if (result != nullptr) {
+		MemberDocData doc_data;
+		if (has_comment(result->start_line, true)) {
+			// Inline doc comment.
+			doc_data = parse_doc_comment(result->start_line, true);
+		} else if (doc_comment_line >= min_member_doc_line && has_comment(doc_comment_line, true) && tokenizer->get_comments()[doc_comment_line].new_line) {
+			// Normal doc comment.
+			doc_data = parse_doc_comment(doc_comment_line);
+		}
+
+		if (result->type == Node::CONSTANT) {
+			static_cast<ConstantNode *>(result)->doc_data = doc_data;
+		} else if (result->type == Node::VARIABLE) {
+			static_cast<VariableNode *>(result)->doc_data = doc_data;
 		}
+
+		min_member_doc_line = result->end_line + 1; // Prevent multiple members from using the same doc comment.
 	}
+#endif // TOOLS_ENABLED
 
 #ifdef DEBUG_ENABLED
 	if (unreachable && result != nullptr) {
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index 09defdf8cd76..2a9d416e3696 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -699,12 +699,12 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 					symbol_identifier = "_init";
 				}
 				if (OK == GDScriptLanguage::get_singleton()->lookup_code(parser->get_text_for_lookup_symbol(pos, symbol_identifier, p_func_required), symbol_identifier, path, nullptr, ret)) {
-					if (ret.type == ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION) {
+					if (ret.location >= 0) {
 						String target_script_path = path;
-						if (!ret.script.is_null()) {
+						if (ret.script.is_valid()) {
 							target_script_path = ret.script->get_path();
-						} else if (!ret.class_path.is_empty()) {
-							target_script_path = ret.class_path;
+						} else if (!ret.script_path.is_empty()) {
+							target_script_path = ret.script_path;
 						}
 
 						if (const ExtendGDScriptParser *target_parser = get_parse_result(target_script_path)) {
@@ -720,7 +720,6 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 								}
 							}
 						}
-
 					} else {
 						String member = ret.class_member;
 						if (member.is_empty() && symbol_identifier != ret.class_name) {
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index ec7328be4a4f..0824beb94f90 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -238,6 +238,7 @@ class CSharpScript : public Script {
 	void set_source_code(const String &p_code) override;
 
 #ifdef TOOLS_ENABLED
+	virtual StringName get_doc_class_name() const override { return StringName(); } // TODO
 	virtual Vector<DocData::ClassDoc> get_documentation() const override {
 		// TODO
 		Vector<DocData::ClassDoc> docs;
diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp
index cbd51ca69456..b3506049335e 100644
--- a/scene/gui/code_edit.cpp
+++ b/scene/gui/code_edit.cpp
@@ -31,6 +31,7 @@
 #include "code_edit.h"
 #include "code_edit.compat.inc"
 
+#include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
 #include "core/string/ustring.h"
@@ -438,6 +439,12 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			}
 		}
 
+		if (symbol_tooltip_on_hover_enabled) {
+			symbol_tooltip_word = get_word_at_pos(mpos);
+			symbol_tooltip_pos = get_line_column_at_pos(mpos, false);
+			symbol_tooltip_timer->start();
+		}
+
 		bool scroll_hovered = code_completion_scroll_rect.has_point(mpos);
 		if (is_code_completion_scroll_hovered != scroll_hovered) {
 			is_code_completion_scroll_hovered = scroll_hovered;
@@ -2412,6 +2419,26 @@ void CodeEdit::set_symbol_lookup_word_as_valid(bool p_valid) {
 	}
 }
 
+/* Symbol tooltip */
+void CodeEdit::set_symbol_tooltip_on_hover_enabled(bool p_enabled) {
+	symbol_tooltip_on_hover_enabled = p_enabled;
+	if (!p_enabled) {
+		symbol_tooltip_timer->stop();
+	}
+}
+
+bool CodeEdit::is_symbol_tooltip_on_hover_enabled() const {
+	return symbol_tooltip_on_hover_enabled;
+}
+
+void CodeEdit::_on_symbol_tooltip_timer_timeout() {
+	const int line = symbol_tooltip_pos.y;
+	const int column = symbol_tooltip_pos.x;
+	if (!symbol_tooltip_word.is_empty() && line >= 0 && column >= 0) {
+		emit_signal(SNAME("symbol_hovered"), symbol_tooltip_word, line, column);
+	}
+}
+
 /* Text manipulation */
 void CodeEdit::move_lines_up() {
 	begin_complex_operation();
@@ -2775,6 +2802,10 @@ void CodeEdit::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_symbol_lookup_word_as_valid", "valid"), &CodeEdit::set_symbol_lookup_word_as_valid);
 
+	/* Symbol tooltip */
+	ClassDB::bind_method(D_METHOD("set_symbol_tooltip_on_hover_enabled", "enable"), &CodeEdit::set_symbol_tooltip_on_hover_enabled);
+	ClassDB::bind_method(D_METHOD("is_symbol_tooltip_on_hover_enabled"), &CodeEdit::is_symbol_tooltip_on_hover_enabled);
+
 	/* Text manipulation */
 	ClassDB::bind_method(D_METHOD("move_lines_up"), &CodeEdit::move_lines_up);
 	ClassDB::bind_method(D_METHOD("move_lines_down"), &CodeEdit::move_lines_down);
@@ -2784,6 +2815,7 @@ void CodeEdit::_bind_methods() {
 
 	/* Inspector */
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "symbol_lookup_on_click"), "set_symbol_lookup_on_click_enabled", "is_symbol_lookup_on_click_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "symbol_tooltip_on_hover"), "set_symbol_tooltip_on_hover_enabled", "is_symbol_tooltip_on_hover_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "line_folding"), "set_line_folding_enabled", "is_line_folding_enabled");
 
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_INT32_ARRAY, "line_length_guidelines"), "set_line_length_guidelines", "get_line_length_guidelines");
@@ -2830,6 +2862,9 @@ void CodeEdit::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("symbol_lookup", PropertyInfo(Variant::STRING, "symbol"), PropertyInfo(Variant::INT, "line"), PropertyInfo(Variant::INT, "column")));
 	ADD_SIGNAL(MethodInfo("symbol_validate", PropertyInfo(Variant::STRING, "symbol")));
 
+	/* Symbol tooltip */
+	ADD_SIGNAL(MethodInfo("symbol_hovered", PropertyInfo(Variant::STRING, "symbol"), PropertyInfo(Variant::INT, "line"), PropertyInfo(Variant::INT, "column")));
+
 	/* Theme items */
 	/* Gutters */
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CodeEdit, code_folding_color);
@@ -3753,6 +3788,13 @@ CodeEdit::CodeEdit() {
 	set_gutter_custom_draw(gutter_idx, callable_mp(this, &CodeEdit::_fold_gutter_draw_callback));
 	gutter_idx++;
 
+	/* Symbol tooltip */
+	symbol_tooltip_timer = memnew(Timer);
+	symbol_tooltip_timer->set_wait_time(GLOBAL_GET("gui/timers/tooltip_delay_sec"));
+	symbol_tooltip_timer->set_one_shot(true);
+	symbol_tooltip_timer->connect("timeout", callable_mp(this, &CodeEdit::_on_symbol_tooltip_timer_timeout));
+	add_child(symbol_tooltip_timer, false, INTERNAL_MODE_FRONT);
+
 	connect("lines_edited_from", callable_mp(this, &CodeEdit::_lines_edited_from));
 	connect("text_set", callable_mp(this, &CodeEdit::_text_set));
 	connect(SceneStringName(text_changed), callable_mp(this, &CodeEdit::_text_changed));
diff --git a/scene/gui/code_edit.h b/scene/gui/code_edit.h
index 2cd34ec99f10..cdd77535b87b 100644
--- a/scene/gui/code_edit.h
+++ b/scene/gui/code_edit.h
@@ -233,11 +233,17 @@ class CodeEdit : public TextEdit {
 
 	/* Symbol lookup */
 	bool symbol_lookup_on_click_enabled = false;
-
-	String symbol_lookup_new_word = "";
-	String symbol_lookup_word = "";
+	String symbol_lookup_new_word;
+	String symbol_lookup_word;
 	Point2i symbol_lookup_pos;
 
+	/* Symbol tooltip */
+	bool symbol_tooltip_on_hover_enabled = false;
+	String symbol_tooltip_word;
+	Point2i symbol_tooltip_pos; // Column and line.
+	Timer *symbol_tooltip_timer = nullptr;
+	void _on_symbol_tooltip_timer_timeout();
+
 	/* Visual */
 	struct ThemeCache {
 		/* Gutters */
@@ -497,6 +503,10 @@ class CodeEdit : public TextEdit {
 
 	void set_symbol_lookup_word_as_valid(bool p_valid);
 
+	/* Symbol tooltip */
+	void set_symbol_tooltip_on_hover_enabled(bool p_enabled);
+	bool is_symbol_tooltip_on_hover_enabled() const;
+
 	/* Text manipulation */
 	void move_lines_up();
 	void move_lines_down();