From f39a362b8577b784e6ede370ba89025f5432dda3 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Tue, 25 Jul 2023 00:09:52 -0400
Subject: [PATCH 01/56] Implemented the initial V2 of a basic symbol tooltip. 
 Created a new class for it.

---
 editor/editor_help.cpp                |   3 +-
 editor/editor_help.h                  |   2 +
 editor/plugins/script_text_editor.cpp |   6 +
 editor/plugins/script_text_editor.h   |   3 +
 editor/symbol_tooltip.cpp             | 286 ++++++++++++++++++++++++++
 editor/symbol_tooltip.h               |  71 +++++++
 6 files changed, 370 insertions(+), 1 deletion(-)
 create mode 100644 editor/symbol_tooltip.cpp
 create mode 100644 editor/symbol_tooltip.h

diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index 2cbbb59be26b..cd1cc9938a85 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -1955,7 +1955,8 @@ void EditorHelp::_help_callback(const String &p_topic) {
 	}
 }
 
-static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node, const String &p_class = "") {
+// TODO: Should probably move this to a shared utility file/class so it can be accessed by both 'editor_help.cpp' and 'symbol_tooltip.cpp'
+void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node, const String &p_class = "") {
 	DocTools *doc = EditorHelp::get_doc_data();
 	String base_path;
 
diff --git a/editor/editor_help.h b/editor/editor_help.h
index 0aa8302b27c6..3609f36838bf 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -251,4 +251,6 @@ class EditorHelpBit : public MarginContainer {
 	EditorHelpBit();
 };
 
+void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node);
+
 #endif // EDITOR_HELP_H
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 321c0f34b59a..4e20e9c060b9 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1859,6 +1859,7 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 
 void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
 	Ref<InputEventMouseButton> mb = ev;
+	Ref<InputEventMouseMotion> mm = ev;
 	Ref<InputEventKey> k = ev;
 	Point2 local_pos;
 	bool create_menu = false;
@@ -1867,6 +1868,8 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
 	if (mb.is_valid() && mb->get_button_index() == MouseButton::RIGHT && mb->is_pressed()) {
 		local_pos = mb->get_global_position() - tx->get_global_position();
 		create_menu = true;
+	} else if (mm.is_valid()) {
+		symbol_tooltip->update_symbol_tooltip(mm->get_position());
 	} else if (k.is_valid() && k->is_action("ui_menu", true)) {
 		tx->adjust_viewport_to_caret(0);
 		local_pos = tx->get_caret_draw_pos(0);
@@ -2322,6 +2325,9 @@ ScriptTextEditor::ScriptTextEditor() {
 	connection_info_dialog = memnew(ConnectionInfoDialog);
 
 	SET_DRAG_FORWARDING_GCD(code_editor->get_text_editor(), ScriptTextEditor);
+
+	symbol_tooltip = memnew(SymbolTooltip(code_editor));
+	add_child(symbol_tooltip);
 }
 
 ScriptTextEditor::~ScriptTextEditor() {
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index d275013b9165..a27a94beca1f 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -34,6 +34,7 @@
 #include "script_editor_plugin.h"
 
 #include "editor/code_editor.h"
+#include "editor/symbol_tooltip.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
@@ -156,6 +157,8 @@ class ScriptTextEditor : public ScriptEditorBase {
 
 	void _enable_code_editor();
 
+	SymbolTooltip *symbol_tooltip = nullptr;
+
 protected:
 	void _update_breakpoint_list();
 	void _breakpoint_item_pressed(int p_idx);
diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
new file mode 100644
index 000000000000..866463421dbf
--- /dev/null
+++ b/editor/symbol_tooltip.cpp
@@ -0,0 +1,286 @@
+/**************************************************************************/
+/*  symbol_tooltip.cpp                                                    */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "symbol_tooltip.h"
+#include "editor/plugins/script_text_editor.h"
+#include "editor_help.h"
+#include "editor_node.h"
+
+SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_editor) { //(CodeTextEditor* code_editor) : code_editor(code_editor) {
+	// Initialize the tooltip components
+
+	// Set the tooltip's theme (PanelContainer's theme)
+	//set_theme(EditorNode::get_singleton()->get_gui_base()->get_theme());
+	hide();
+	set_theme(_create_panel_theme());
+
+	// Create VBoxContainer to hold the tooltip's header and body
+	layout_container = memnew(VBoxContainer);
+	add_child(layout_container);
+
+	// Create RichTextLabel for the tooltip's header
+	header_label = memnew(RichTextLabel);
+	header_label->set_use_bbcode(true);
+	header_label->set_selection_enabled(true);
+	header_label->set_custom_minimum_size(Size2(0, 50));
+	header_label->set_focus_mode(FOCUS_ALL);
+	header_label->set_theme(_create_header_label_theme());
+	layout_container->add_child(header_label);
+
+	// Create RichTextLabel for the tooltip's body
+	body_label = memnew(RichTextLabel);
+	body_label->set_use_bbcode(true);
+	body_label->set_selection_enabled(true);
+	body_label->set_focus_mode(FOCUS_ALL);
+	body_label->set_v_size_flags(SIZE_EXPAND_FILL);
+	body_label->set_theme(_create_body_label_theme());
+	layout_container->add_child(body_label);
+
+
+	// Connect the tooltip's update function to the mouse motion signal
+	// connect("mouse_motion", callable_mp(this, &SymbolTooltip::_update_symbol_tooltip));
+}
+
+void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
+	// Get the word under the mouse cursor
+	CodeEdit *text_editor = code_editor->get_text_editor();
+	String _symbol_word = text_editor->get_word_at_pos(mouse_position);
+	if (!_symbol_word.is_empty()) {
+		symbol_word = _symbol_word;
+		header_content = symbol_word;
+	}
+
+	// Get the symbol type of the word under the mouse cursor
+	//String symbol_type = text_editor->get_symbol_type_at_pos(mouse_position);
+	//String symbol_info = text_editor->get_symbol_info_at_pos(mouse_position);
+	// symbol_info is a string containing the symbol's type, name, and documentation
+
+	// Retrieve the EditorInterface singleton
+	//EditorInterface *editor_interface = EditorInterface::get_singleton();
+
+	// Retrieve the currently active ScriptTextEditor
+	//ScriptTextEditor *script_editor = editor_interface->get_editor_viewport()->get_script_text_editor();
+	//ScriptLanguage *language;
+
+	//ScriptTextEditor *script_editor = text_editor.script //EditorNode::get_script_text_editor();
+
+	Node *base = get_tree()->get_edited_scene_root();
+	Ref<Script> script = base->get_script();
+	/*if (base) {
+		base = _find_node_for_script(base, base, script);
+	}*/
+
+	// https://github.com/godotengine/godot/pull/63908/files#diff-fa2cafb4b2d8b59e5baeba0b861f7f2f6bf6c213d6387254fee5a7682478e588R1564-R1573
+	ScriptLanguage::LookupResult result;
+	/*if (ScriptServer::is_global_class(symbol_word)) {
+		header_content = "class " + symbol_word; //ScriptLanguage::SymbolHint::SYMBOL_CLASS;
+		body_content = "In " + ScriptServer::get_global_class_path(symbol_word);
+		// https://github.com/godotengine/godot/pull/63908/files#diff-fa2cafb4b2d8b59e5baeba0b861f7f2f6bf6c213d6387254fee5a7682478e588R1564-R1573
+	}*/
+
+	if (script != NULL && script->get_language()->lookup_code(text_editor->get_text_for_symbol_lookup(), symbol_word, script->get_path(), base, result) != OK) {
+		//_hide_symbol_hint();
+		print_line(vformat("Result for %s:\n%s", symbol_word, ""));
+	}
+
+	// Get the documentation of the word under the mouse cursor
+	// TODO: Account for the context of the word (e.g. class, method, etc.)
+	//		and the context of the current line and surrounding lines.
+	String documentation = _get_doc_of_word(symbol_word);
+	body_content = documentation;
+
+	// Calculate and set the tooltip's position
+	Vector2 line_col = text_editor->get_line_column_at_pos(mouse_position);
+	int row = line_col.y;
+	int col = line_col.x;
+	String line = text_editor->get_line(row);
+	int symbol_col = _get_column_pos_of_word(symbol_word, line, text_editor->SEARCH_MATCH_CASE | text_editor->SEARCH_WHOLE_WORDS, 0);
+	if(symbol_col >= 0) {
+		Vector2 _symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
+		if(symbol_position != _symbol_position) {
+			symbol_position = _symbol_position;
+			Vector2 tooltip_position = Vector2(mouse_position.x, symbol_position.y);
+			set_position(tooltip_position);
+		}
+	}
+
+	// Calculate and set the tooltip's size
+	Vector2 size = Vector2(600, 300);
+	set_size(size);
+
+	// Update the tooltip's header and body
+	_update_header_label(header_content); //symbol_word);
+	_update_body_label(body_content); //documentation);
+
+	// Bring the tooltip to the front
+	move_to_front();
+
+	Rect2 tooltip_rect = Rect2(get_position(), get_size());
+	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
+	if (!symbol_word.is_empty() || mouse_over_tooltip) {
+		show();
+	} else {
+		hide();
+	}
+}
+
+void SymbolTooltip::_update_header_label(const String &header_content) {
+	// Set the tooltip's header text
+	header_label->set_text(header_content);
+}
+
+void SymbolTooltip::_update_body_label(const String &body_content) {
+	// Set the tooltip's body text
+	_add_text_to_rt(body_content, body_label, this);
+	body_label->set_text(body_content);
+}
+
+String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
+	String documentation;
+
+	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
+	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
+		const DocData::ClassDoc &class_doc = E.value;
+
+		if (class_doc.name == symbol_word) {
+			documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
+			break;
+		}
+
+		for (int i = 0; i < class_doc.methods.size(); ++i) {
+			const DocData::MethodDoc &method_doc = class_doc.methods[i];
+
+			if (method_doc.name == symbol_word) {
+				documentation = method_doc.description.strip_edges();
+				break;
+			}
+		}
+
+		if (!documentation.is_empty()) {
+			break;
+		}
+	}
+
+	/*if (!documentation.is_empty()) {
+		print_line(vformat("Documentation for %s:\n%s", symbol_word, documentation));
+	}*/
+	return documentation;
+}
+
+Ref<Theme> SymbolTooltip::_create_panel_theme() {
+	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
+
+	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
+	style_box->set_bg_color(Color().html("#363d4a")); // Set the background color (RGBA)
+	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.47)); // Set the border color (RGBA)
+	style_box->set_border_width_all(1); // Set the border width
+	style_box->set_corner_radius_all(4); // Set the border radius for curved corners
+	//style_box->set_content_margin_all(20);
+	theme->set_stylebox("panel", "PanelContainer", style_box);
+
+	return theme;
+}
+
+Ref<Theme> SymbolTooltip::_create_header_label_theme() {
+	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
+
+	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
+	style_box->set_draw_center(false);
+	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.27)); // Set the border color (RGBA)
+	style_box->set_border_width(SIDE_BOTTOM, 1);
+	style_box->set_content_margin_individual(15, 10, 15, 10);
+	theme->set_stylebox("normal", "RichTextLabel", style_box);
+
+	return theme;
+}
+
+Ref<Theme> SymbolTooltip::_create_body_label_theme() {
+	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
+
+	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
+	style_box->set_draw_center(false);
+	style_box->set_content_margin_individual(15, 10, 15, 10);
+	theme->set_stylebox("normal", "RichTextLabel", style_box);
+
+	return theme;
+}
+
+// Copied from text_edit.cpp
+int SymbolTooltip::_get_column_pos_of_word(const String &p_key, const String &p_search, uint32_t p_search_flags, int p_from_column) const {
+	int col = -1;
+
+	if (p_key.length() > 0 && p_search.length() > 0) {
+		if (p_from_column < 0 || p_from_column > p_search.length()) {
+			p_from_column = 0;
+		}
+
+		while (col == -1 && p_from_column <= p_search.length()) {
+			if (p_search_flags & CodeEdit::SEARCH_MATCH_CASE) {
+				col = p_search.find(p_key, p_from_column);
+			} else {
+				col = p_search.findn(p_key, p_from_column);
+			}
+
+			// Whole words only.
+			if (col != -1 && p_search_flags & CodeEdit::SEARCH_WHOLE_WORDS) {
+				p_from_column = col;
+
+				if (col > 0 && !is_symbol(p_search[col - 1])) {
+					col = -1;
+				} else if ((col + p_key.length()) < p_search.length() && !is_symbol(p_search[col + p_key.length()])) {
+					col = -1;
+				}
+			}
+
+			p_from_column += 1;
+		}
+	}
+	return col;
+}
+
+// Copied from script_text_editor.cpp
+/*
+static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
+	if (p_current->get_owner() != p_base && p_base != p_current) {
+		return nullptr;
+	}
+	Ref<Script> c = p_current->get_script();
+	if (c == p_script) {
+		return p_current;
+	}
+	for (int i = 0; i < p_current->get_child_count(); i++) {
+		Node *found = _find_node_for_script(p_base, p_current->get_child(i), p_script);
+		if (found) {
+			return found;
+		}
+	}
+
+	return nullptr;
+}*/
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
new file mode 100644
index 000000000000..7356ac3ac4c8
--- /dev/null
+++ b/editor/symbol_tooltip.h
@@ -0,0 +1,71 @@
+/**************************************************************************/
+/*  symbol_tooltip.h                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef SYMBOL_TOOLTIP_H
+#define SYMBOL_TOOLTIP_H
+
+//#include "core/script_language.h"
+#include "code_editor.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/panel_container.h"
+#include "scene/gui/rich_text_label.h"
+
+class SymbolTooltip : public PanelContainer {
+	GDCLASS(SymbolTooltip, PanelContainer);
+
+	//Ref<Script> script;
+	CodeTextEditor *code_editor = nullptr;
+	VBoxContainer *layout_container = nullptr;
+	RichTextLabel *header_label = nullptr;
+	RichTextLabel *body_label = nullptr;
+
+	String _get_doc_of_word(const String &symbol_word);
+	void _update_header_label(const String &symbol_word);
+	void _update_body_label(const String &documentation);
+	Ref<Theme> _create_panel_theme();
+	Ref<Theme> _create_header_label_theme();
+	Ref<Theme> _create_body_label_theme();
+	int _get_column_pos_of_word(const String &p_key, const String &p_search, uint32_t p_search_flags, int p_from_column) const;
+
+	String symbol_word;
+	String header_content;
+	String body_content;
+	Vector2 symbol_position;
+	//Vector2 tooltip_position;
+public:
+	void update_symbol_tooltip(const Vector2 &mouse_position);
+	void show_tooltip();
+	void hide_tooltip();
+	SymbolTooltip(CodeTextEditor* code_editor);
+};
+
+//static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
+
+#endif //GODOT_SYMBOL_TOOLTIP_H

From 81335c987dee594d71c024891a3b62d4062b77db Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Tue, 25 Jul 2023 00:32:56 -0400
Subject: [PATCH 02/56] Fixed _update_body_label()

---
 editor/symbol_tooltip.cpp | 6 +++---
 editor/symbol_tooltip.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 866463421dbf..bc988ee13f96 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -158,8 +158,9 @@ void SymbolTooltip::_update_header_label(const String &header_content) {
 
 void SymbolTooltip::_update_body_label(const String &body_content) {
 	// Set the tooltip's body text
+	body_label->clear();
 	_add_text_to_rt(body_content, body_label, this);
-	body_label->set_text(body_content);
+	//body_label->set_text(body_content);
 }
 
 String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
@@ -266,7 +267,6 @@ int SymbolTooltip::_get_column_pos_of_word(const String &p_key, const String &p_
 }
 
 // Copied from script_text_editor.cpp
-/*
 static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
 	if (p_current->get_owner() != p_base && p_base != p_current) {
 		return nullptr;
@@ -283,4 +283,4 @@ static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Scri
 	}
 
 	return nullptr;
-}*/
+}
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 7356ac3ac4c8..b1f9231878e4 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -66,6 +66,6 @@ class SymbolTooltip : public PanelContainer {
 	SymbolTooltip(CodeTextEditor* code_editor);
 };
 
-//static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
+static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
 
 #endif //GODOT_SYMBOL_TOOLTIP_H

From bf0ef567c44c2c90d08bdee8a1f32e405f9abf69 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Tue, 25 Jul 2023 01:13:44 -0400
Subject: [PATCH 03/56] Added some additional logic for when a symbol is
 considered 'hovered' over. Needs more improvement.

---
 editor/symbol_tooltip.cpp | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index bc988ee13f96..41063fb88358 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -91,24 +91,24 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 
 	//ScriptTextEditor *script_editor = text_editor.script //EditorNode::get_script_text_editor();
 
-	Node *base = get_tree()->get_edited_scene_root();
-	Ref<Script> script = base->get_script();
+	/*Node *base = get_tree()->get_edited_scene_root();
+	Ref<Script> script = base->get_script();*/
 	/*if (base) {
 		base = _find_node_for_script(base, base, script);
 	}*/
 
 	// https://github.com/godotengine/godot/pull/63908/files#diff-fa2cafb4b2d8b59e5baeba0b861f7f2f6bf6c213d6387254fee5a7682478e588R1564-R1573
-	ScriptLanguage::LookupResult result;
+	//ScriptLanguage::LookupResult result;
 	/*if (ScriptServer::is_global_class(symbol_word)) {
 		header_content = "class " + symbol_word; //ScriptLanguage::SymbolHint::SYMBOL_CLASS;
 		body_content = "In " + ScriptServer::get_global_class_path(symbol_word);
 		// https://github.com/godotengine/godot/pull/63908/files#diff-fa2cafb4b2d8b59e5baeba0b861f7f2f6bf6c213d6387254fee5a7682478e588R1564-R1573
 	}*/
 
-	if (script != NULL && script->get_language()->lookup_code(text_editor->get_text_for_symbol_lookup(), symbol_word, script->get_path(), base, result) != OK) {
+	/*if (script != NULL && script->get_language()->lookup_code(text_editor->get_text_for_symbol_lookup(), symbol_word, script->get_path(), base, result) != OK) {
 		//_hide_symbol_hint();
 		print_line(vformat("Result for %s:\n%s", symbol_word, ""));
-	}
+	}*/
 
 	// Get the documentation of the word under the mouse cursor
 	// TODO: Account for the context of the word (e.g. class, method, etc.)
@@ -120,14 +120,24 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 	Vector2 line_col = text_editor->get_line_column_at_pos(mouse_position);
 	int row = line_col.y;
 	int col = line_col.x;
-	String line = text_editor->get_line(row);
-	int symbol_col = _get_column_pos_of_word(symbol_word, line, text_editor->SEARCH_MATCH_CASE | text_editor->SEARCH_WHOLE_WORDS, 0);
-	if(symbol_col >= 0) {
-		Vector2 _symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-		if(symbol_position != _symbol_position) {
-			symbol_position = _symbol_position;
-			Vector2 tooltip_position = Vector2(mouse_position.x, symbol_position.y);
-			set_position(tooltip_position);
+	int num_lines = text_editor->get_line_count();
+	if (row >= 0 && row < num_lines) {
+		String line = text_editor->get_line(row);
+		int symbol_col = _get_column_pos_of_word(symbol_word, line, text_editor->SEARCH_MATCH_CASE | text_editor->SEARCH_WHOLE_WORDS, 0);
+		if(symbol_col >= 0) {
+			// Calculate the symbol end column
+			int symbol_end = symbol_col + symbol_word.length();
+			if (col > symbol_end) {
+				// Mouse is to the right of the last symbol character
+				hide();
+				return;
+			}
+			Vector2 _symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
+			if(symbol_position != _symbol_position) {
+				symbol_position = _symbol_position;
+				Vector2 tooltip_position = Vector2(mouse_position.x, symbol_position.y);
+				set_position(tooltip_position);
+			}
 		}
 	}
 

From 9fc84467ef2c4e4b9843733aea5699c98972d71d Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Thu, 27 Jul 2023 00:54:17 -0400
Subject: [PATCH 04/56] Some refactoring + improved hover logic.

---
 editor/editor_help.cpp    |   2 +-
 editor/editor_help.h      |   2 +-
 editor/symbol_tooltip.cpp | 131 +++++++++++++++++---------------------
 editor/symbol_tooltip.h   |  14 ++--
 4 files changed, 69 insertions(+), 80 deletions(-)

diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index cd1cc9938a85..52f82c1d83e6 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -1956,7 +1956,7 @@ void EditorHelp::_help_callback(const String &p_topic) {
 }
 
 // TODO: Should probably move this to a shared utility file/class so it can be accessed by both 'editor_help.cpp' and 'symbol_tooltip.cpp'
-void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node, const String &p_class = "") {
+void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node, const String &p_class) {
 	DocTools *doc = EditorHelp::get_doc_data();
 	String base_path;
 
diff --git a/editor/editor_help.h b/editor/editor_help.h
index 3609f36838bf..56ff9386601c 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -251,6 +251,6 @@ class EditorHelpBit : public MarginContainer {
 	EditorHelpBit();
 };
 
-void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node);
+void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, Control *p_owner_node, const String &p_class = "");
 
 #endif // EDITOR_HELP_H
diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 41063fb88358..f1f41606c008 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -31,13 +31,13 @@
 #include "symbol_tooltip.h"
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
-#include "editor_node.h"
 
 SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_editor) { //(CodeTextEditor* code_editor) : code_editor(code_editor) {
 	// Initialize the tooltip components
 
 	// Set the tooltip's theme (PanelContainer's theme)
 	//set_theme(EditorNode::get_singleton()->get_gui_base()->get_theme());
+
 	hide();
 	set_theme(_create_panel_theme());
 
@@ -63,102 +63,91 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_edi
 	body_label->set_theme(_create_body_label_theme());
 	layout_container->add_child(body_label);
 
+	tooltip_delay = memnew(Timer);
+	tooltip_delay->set_one_shot(true);
+	tooltip_delay->set_wait_time(0.5);
+	add_child(tooltip_delay);
+
+	tooltip_delay->connect("timeout", callable_mp(this, &SymbolTooltip::_on_tooltip_delay_timeout));
 
 	// Connect the tooltip's update function to the mouse motion signal
 	// connect("mouse_motion", callable_mp(this, &SymbolTooltip::_update_symbol_tooltip));
 }
 
+SymbolTooltip::~SymbolTooltip() {
+	memdelete(tooltip_delay);
+}
+
+void SymbolTooltip::_on_tooltip_delay_timeout() {
+	move_to_front(); // Bring the tooltip to the front
+	show();
+}
+
 void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
-	// Get the word under the mouse cursor
 	CodeEdit *text_editor = code_editor->get_text_editor();
-	String _symbol_word = text_editor->get_word_at_pos(mouse_position);
-	if (!_symbol_word.is_empty()) {
-		symbol_word = _symbol_word;
-		header_content = symbol_word;
+	String symbol_word = _get_symbol_word(text_editor, mouse_position);
+	if (symbol_word.is_empty()) {
+		tooltip_delay->stop();
+		hide();
+		return;
 	}
 
-	// Get the symbol type of the word under the mouse cursor
-	//String symbol_type = text_editor->get_symbol_type_at_pos(mouse_position);
-	//String symbol_info = text_editor->get_symbol_info_at_pos(mouse_position);
-	// symbol_info is a string containing the symbol's type, name, and documentation
-
-	// Retrieve the EditorInterface singleton
-	//EditorInterface *editor_interface = EditorInterface::get_singleton();
+	_update_tooltip_size();
 
-	// Retrieve the currently active ScriptTextEditor
-	//ScriptTextEditor *script_editor = editor_interface->get_editor_viewport()->get_script_text_editor();
-	//ScriptLanguage *language;
-
-	//ScriptTextEditor *script_editor = text_editor.script //EditorNode::get_script_text_editor();
-
-	/*Node *base = get_tree()->get_edited_scene_root();
-	Ref<Script> script = base->get_script();*/
-	/*if (base) {
-		base = _find_node_for_script(base, base, script);
-	}*/
+	// Get the documentation of the word under the mouse cursor
+	String documentation = _get_doc_of_word(symbol_word);
+	_update_tooltip_content(symbol_word, documentation);
 
-	// https://github.com/godotengine/godot/pull/63908/files#diff-fa2cafb4b2d8b59e5baeba0b861f7f2f6bf6c213d6387254fee5a7682478e588R1564-R1573
-	//ScriptLanguage::LookupResult result;
-	/*if (ScriptServer::is_global_class(symbol_word)) {
-		header_content = "class " + symbol_word; //ScriptLanguage::SymbolHint::SYMBOL_CLASS;
-		body_content = "In " + ScriptServer::get_global_class_path(symbol_word);
-		// https://github.com/godotengine/godot/pull/63908/files#diff-fa2cafb4b2d8b59e5baeba0b861f7f2f6bf6c213d6387254fee5a7682478e588R1564-R1573
-	}*/
+	Rect2 tooltip_rect = Rect2(get_position(), get_size());
+	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
+	if (!mouse_over_tooltip) {
+		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, mouse_position);
+		if (tooltip_position == Vector2(-1, -1)) { // If invalid position
+			tooltip_delay->stop();
+			hide();
+			return;
+		} else {
+			set_position(tooltip_position);
+		}
+	}
 
-	/*if (script != NULL && script->get_language()->lookup_code(text_editor->get_text_for_symbol_lookup(), symbol_word, script->get_path(), base, result) != OK) {
-		//_hide_symbol_hint();
-		print_line(vformat("Result for %s:\n%s", symbol_word, ""));
-	}*/
+	// Start the timer to show the tooltip after a delay
+	//tooltip_delay->start();
+	_on_tooltip_delay_timeout();
+}
 
-	// Get the documentation of the word under the mouse cursor
-	// TODO: Account for the context of the word (e.g. class, method, etc.)
-	//		and the context of the current line and surrounding lines.
-	String documentation = _get_doc_of_word(symbol_word);
-	body_content = documentation;
+String SymbolTooltip::_get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position) {
+	// Get the word under the mouse cursor
+	return text_editor->get_word_at_pos(mouse_position);
+}
 
-	// Calculate and set the tooltip's position
+Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position) {
+	CodeEdit *text_editor = code_editor->get_text_editor();
 	Vector2 line_col = text_editor->get_line_column_at_pos(mouse_position);
 	int row = line_col.y;
 	int col = line_col.x;
 	int num_lines = text_editor->get_line_count();
 	if (row >= 0 && row < num_lines) {
 		String line = text_editor->get_line(row);
-		int symbol_col = _get_column_pos_of_word(symbol_word, line, text_editor->SEARCH_MATCH_CASE | text_editor->SEARCH_WHOLE_WORDS, 0);
-		if(symbol_col >= 0) {
-			// Calculate the symbol end column
-			int symbol_end = symbol_col + symbol_word.length();
-			if (col > symbol_end) {
-				// Mouse is to the right of the last symbol character
-				hide();
-				return;
-			}
-			Vector2 _symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-			if(symbol_position != _symbol_position) {
-				symbol_position = _symbol_position;
-				Vector2 tooltip_position = Vector2(mouse_position.x, symbol_position.y);
-				set_position(tooltip_position);
-			}
+		uint32_t search_flags = text_editor->SEARCH_MATCH_CASE | text_editor->SEARCH_WHOLE_WORDS;
+		int symbol_col = _get_column_pos_of_word(symbol_word, line, search_flags, 0) + 1;
+		if (symbol_col >= 0 && col >= symbol_col && col <= symbol_col + symbol_word.length()) {
+			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
+			return Vector2(symbol_position.x, symbol_position.y + 5); // Adjust the position to be below the symbol
 		}
 	}
+	return Vector2(-1,-1); // indicates an invalid position
+}
 
+void SymbolTooltip::_update_tooltip_size() {
 	// Calculate and set the tooltip's size
-	Vector2 size = Vector2(600, 300);
-	set_size(size);
+	set_size(Vector2(600, 300));
+}
 
+void SymbolTooltip::_update_tooltip_content(const String &header_content, const String &body_content) {
 	// Update the tooltip's header and body
-	_update_header_label(header_content); //symbol_word);
-	_update_body_label(body_content); //documentation);
-
-	// Bring the tooltip to the front
-	move_to_front();
-
-	Rect2 tooltip_rect = Rect2(get_position(), get_size());
-	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
-	if (!symbol_word.is_empty() || mouse_over_tooltip) {
-		show();
-	} else {
-		hide();
-	}
+	_update_header_label(header_content);
+	_update_body_label(body_content);
 }
 
 void SymbolTooltip::_update_header_label(const String &header_content) {
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index b1f9231878e4..f2c91ca3c30b 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -45,6 +45,7 @@ class SymbolTooltip : public PanelContainer {
 	VBoxContainer *layout_container = nullptr;
 	RichTextLabel *header_label = nullptr;
 	RichTextLabel *body_label = nullptr;
+	Timer *tooltip_delay;
 
 	String _get_doc_of_word(const String &symbol_word);
 	void _update_header_label(const String &symbol_word);
@@ -54,16 +55,15 @@ class SymbolTooltip : public PanelContainer {
 	Ref<Theme> _create_body_label_theme();
 	int _get_column_pos_of_word(const String &p_key, const String &p_search, uint32_t p_search_flags, int p_from_column) const;
 
-	String symbol_word;
-	String header_content;
-	String body_content;
-	Vector2 symbol_position;
-	//Vector2 tooltip_position;
 public:
+	void _on_tooltip_delay_timeout();
 	void update_symbol_tooltip(const Vector2 &mouse_position);
-	void show_tooltip();
-	void hide_tooltip();
+	String _get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position);
+	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
+	void _update_tooltip_size();
+	void _update_tooltip_content(const String &header_content, const String &body_content);
 	SymbolTooltip(CodeTextEditor* code_editor);
+	~SymbolTooltip();
 };
 
 static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);

From ac17aa43bc81ab7489aaa51af5ddeace8c306133 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 28 Jul 2023 20:51:45 -0400
Subject: [PATCH 05/56] Fixed issue where the tooltip only appeared over the
 first occurrence of a symbol/word in a line.

---
 editor/symbol_tooltip.cpp | 51 ++++++++++++++++++---------------------
 editor/symbol_tooltip.h   |  2 +-
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index f1f41606c008..b9218090b120 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -129,9 +129,8 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 	int num_lines = text_editor->get_line_count();
 	if (row >= 0 && row < num_lines) {
 		String line = text_editor->get_line(row);
-		uint32_t search_flags = text_editor->SEARCH_MATCH_CASE | text_editor->SEARCH_WHOLE_WORDS;
-		int symbol_col = _get_column_pos_of_word(symbol_word, line, search_flags, 0) + 1;
-		if (symbol_col >= 0 && col >= symbol_col && col <= symbol_col + symbol_word.length()) {
+		int symbol_col = _get_word_pos_under_mouse(symbol_word, line, col);
+		if (symbol_col >= 0) {
 			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
 			return Vector2(symbol_position.x, symbol_position.y + 5); // Adjust the position to be below the symbol
 		}
@@ -232,37 +231,33 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 	return theme;
 }
 
-// Copied from text_edit.cpp
-int SymbolTooltip::_get_column_pos_of_word(const String &p_key, const String &p_search, uint32_t p_search_flags, int p_from_column) const {
-	int col = -1;
+int SymbolTooltip::_get_word_pos_under_mouse(const String &symbol_word, const String &p_search, int mouse_x) const {
+	// Created this because _get_column_pos_of_word() only gets the column position of the first occurrence of the word in the line.
 
-	if (p_key.length() > 0 && p_search.length() > 0) {
-		if (p_from_column < 0 || p_from_column > p_search.length()) {
-			p_from_column = 0;
-		}
+	// Early exit if the symbol word is empty, the search string is empty, or the mouse is outside the string.
+	if (symbol_word.is_empty() || p_search.is_empty() || mouse_x < 0 || mouse_x >= p_search.length()) {
+		return -1;
+	}
 
-		while (col == -1 && p_from_column <= p_search.length()) {
-			if (p_search_flags & CodeEdit::SEARCH_MATCH_CASE) {
-				col = p_search.find(p_key, p_from_column);
-			} else {
-				col = p_search.findn(p_key, p_from_column);
-			}
+	int start = mouse_x;
+	int end = mouse_x;
 
-			// Whole words only.
-			if (col != -1 && p_search_flags & CodeEdit::SEARCH_WHOLE_WORDS) {
-				p_from_column = col;
+	// Extend the start and end until they reach the beginning or end of the word.
+	while (start > 0 && is_ascii_identifier_char(p_search[start - 1])) {
+		start--;
+	}
+	while (end < p_search.length() && is_ascii_identifier_char(p_search[end])) {
+		end++;
+	}
 
-				if (col > 0 && !is_symbol(p_search[col - 1])) {
-					col = -1;
-				} else if ((col + p_key.length()) < p_search.length() && !is_symbol(p_search[col + p_key.length()])) {
-					col = -1;
-				}
-			}
+	String word_under_mouse = p_search.substr(start, end - start);
 
-			p_from_column += 1;
-		}
+	// If the word under the mouse matches the symbol word, return the start position.
+	if (word_under_mouse == symbol_word) {
+		return start + 1;  // Note: +1 is added to account for zero-based indexing.
 	}
-	return col;
+
+	return -1;  // Return -1 if no match is found.
 }
 
 // Copied from script_text_editor.cpp
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index f2c91ca3c30b..29cd9e98b846 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -53,7 +53,7 @@ class SymbolTooltip : public PanelContainer {
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();
-	int _get_column_pos_of_word(const String &p_key, const String &p_search, uint32_t p_search_flags, int p_from_column) const;
+	int _get_word_pos_under_mouse(const String &symbol_word, const String &p_search, int mouse_x) const;
 
 public:
 	void _on_tooltip_delay_timeout();

From ab5b542ced11737763b2f0dca796da4b7fae5405 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 28 Jul 2023 23:36:18 -0400
Subject: [PATCH 06/56] Separated the SymbolTooltip from the CodeEditor layout.
 It is now positioned appropriately even in the popout window.

---
 editor/symbol_tooltip.cpp | 37 ++++++++++++++++++++++++++-----------
 editor/symbol_tooltip.h   |  6 ++++--
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index b9218090b120..844da1398c19 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -38,19 +38,25 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_edi
 	// Set the tooltip's theme (PanelContainer's theme)
 	//set_theme(EditorNode::get_singleton()->get_gui_base()->get_theme());
 
-	hide();
-	set_theme(_create_panel_theme());
+	set_transient(true);
+	set_flag(Window::FLAG_NO_FOCUS, true);
+	set_flag(Window::FLAG_POPUP, false);
+	set_flag(Window::FLAG_MOUSE_PASSTHROUGH, false);
+	set_theme(_create_popup_panel_theme());
+	panel_container = memnew(PanelContainer);
+	panel_container->set_theme(_create_panel_theme());
+	add_child(panel_container);
 
 	// Create VBoxContainer to hold the tooltip's header and body
 	layout_container = memnew(VBoxContainer);
-	add_child(layout_container);
+	panel_container->add_child(layout_container);
 
 	// Create RichTextLabel for the tooltip's header
 	header_label = memnew(RichTextLabel);
 	header_label->set_use_bbcode(true);
 	header_label->set_selection_enabled(true);
 	header_label->set_custom_minimum_size(Size2(0, 50));
-	header_label->set_focus_mode(FOCUS_ALL);
+	header_label->set_focus_mode(Control::FOCUS_ALL);
 	header_label->set_theme(_create_header_label_theme());
 	layout_container->add_child(header_label);
 
@@ -58,8 +64,8 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_edi
 	body_label = memnew(RichTextLabel);
 	body_label->set_use_bbcode(true);
 	body_label->set_selection_enabled(true);
-	body_label->set_focus_mode(FOCUS_ALL);
-	body_label->set_v_size_flags(SIZE_EXPAND_FILL);
+	body_label->set_focus_mode(Control::FOCUS_ALL);
+	body_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	body_label->set_theme(_create_body_label_theme());
 	layout_container->add_child(body_label);
 
@@ -79,7 +85,6 @@ SymbolTooltip::~SymbolTooltip() {
 }
 
 void SymbolTooltip::_on_tooltip_delay_timeout() {
-	move_to_front(); // Bring the tooltip to the front
 	show();
 }
 
@@ -96,7 +101,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 
 	// Get the documentation of the word under the mouse cursor
 	String documentation = _get_doc_of_word(symbol_word);
-	_update_tooltip_content(symbol_word, documentation);
+	_update_tooltip_content(symbol_word, documentation + documentation);
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
 	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
@@ -132,7 +137,8 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 		int symbol_col = _get_word_pos_under_mouse(symbol_word, line, col);
 		if (symbol_col >= 0) {
 			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-			return Vector2(symbol_position.x, symbol_position.y + 5); // Adjust the position to be below the symbol
+			Vector2 local_position = Vector2(symbol_position.x, symbol_position.y + 5); // Adjust the position to be below the symbol
+			return text_editor->get_screen_position() + local_position;
 		}
 	}
 	return Vector2(-1,-1); // indicates an invalid position
@@ -157,8 +163,7 @@ void SymbolTooltip::_update_header_label(const String &header_content) {
 void SymbolTooltip::_update_body_label(const String &body_content) {
 	// Set the tooltip's body text
 	body_label->clear();
-	_add_text_to_rt(body_content, body_label, this);
-	//body_label->set_text(body_content);
+	_add_text_to_rt(body_content, body_label, layout_container);
 }
 
 String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
@@ -193,6 +198,16 @@ String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
 	return documentation;
 }
 
+Ref<Theme> SymbolTooltip::_create_popup_panel_theme() {
+	Ref<Theme> theme = memnew(Theme);
+
+	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
+	style_box->set_bg_color(Color(0, 0, 0, 0)); // Set the background color (RGBA)
+	theme->set_stylebox("panel", "PopupPanel", style_box);
+
+	return theme;
+}
+
 Ref<Theme> SymbolTooltip::_create_panel_theme() {
 	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
 
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 29cd9e98b846..46e690ab2e79 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -37,11 +37,12 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/rich_text_label.h"
 
-class SymbolTooltip : public PanelContainer {
-	GDCLASS(SymbolTooltip, PanelContainer);
+class SymbolTooltip : public PopupPanel {
+	GDCLASS(SymbolTooltip, PopupPanel);
 
 	//Ref<Script> script;
 	CodeTextEditor *code_editor = nullptr;
+	PanelContainer *panel_container = nullptr;
 	VBoxContainer *layout_container = nullptr;
 	RichTextLabel *header_label = nullptr;
 	RichTextLabel *body_label = nullptr;
@@ -50,6 +51,7 @@ class SymbolTooltip : public PanelContainer {
 	String _get_doc_of_word(const String &symbol_word);
 	void _update_header_label(const String &symbol_word);
 	void _update_body_label(const String &documentation);
+	Ref<Theme> _create_popup_panel_theme();
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();

From 3bfc6092ef9fd83416792f5eda15ab324ab1fbb5 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 29 Jul 2023 00:01:10 -0400
Subject: [PATCH 07/56] Enabled hover delay.

---
 editor/symbol_tooltip.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 844da1398c19..bdf21421ad96 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -117,8 +117,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 	}
 
 	// Start the timer to show the tooltip after a delay
-	//tooltip_delay->start();
-	_on_tooltip_delay_timeout();
+	tooltip_delay->start();
 }
 
 String SymbolTooltip::_get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position) {
@@ -137,8 +136,7 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 		int symbol_col = _get_word_pos_under_mouse(symbol_word, line, col);
 		if (symbol_col >= 0) {
 			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-			Vector2 local_position = Vector2(symbol_position.x, symbol_position.y + 5); // Adjust the position to be below the symbol
-			return text_editor->get_screen_position() + local_position;
+			return text_editor->get_screen_position() + symbol_position;
 		}
 	}
 	return Vector2(-1,-1); // indicates an invalid position

From 9939cde18a8ad1c1b4e2fd0b4c5ef5c089f87ad8 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 29 Jul 2023 00:07:56 -0400
Subject: [PATCH 08/56] Fixed some code style failures.

---
 editor/symbol_tooltip.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index bdf21421ad96..8b7b3cc57880 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -32,7 +32,7 @@
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
 
-SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_editor) { //(CodeTextEditor* code_editor) : code_editor(code_editor) {
+SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_editor) {
 	// Initialize the tooltip components
 
 	// Set the tooltip's theme (PanelContainer's theme)
@@ -139,7 +139,7 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 			return text_editor->get_screen_position() + symbol_position;
 		}
 	}
-	return Vector2(-1,-1); // indicates an invalid position
+	return Vector2(-1, -1); // indicates an invalid position
 }
 
 void SymbolTooltip::_update_tooltip_size() {
@@ -267,10 +267,10 @@ int SymbolTooltip::_get_word_pos_under_mouse(const String &symbol_word, const St
 
 	// If the word under the mouse matches the symbol word, return the start position.
 	if (word_under_mouse == symbol_word) {
-		return start + 1;  // Note: +1 is added to account for zero-based indexing.
+		return start + 1; // Note: +1 is added to account for zero-based indexing.
 	}
 
-	return -1;  // Return -1 if no match is found.
+	return -1; // Return -1 if no match is found.
 }
 
 // Copied from script_text_editor.cpp

From 9fb099d02999c8d0683a49a9b7eb6a66eb606270 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 29 Jul 2023 01:39:09 -0400
Subject: [PATCH 09/56] Delay now resets when moving between different symbols
 + slight optimization.

---
 editor/symbol_tooltip.cpp | 9 +++++++++
 editor/symbol_tooltip.h   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 8b7b3cc57880..e118e53dacae 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -93,10 +93,19 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 	String symbol_word = _get_symbol_word(text_editor, mouse_position);
 	if (symbol_word.is_empty()) {
 		tooltip_delay->stop();
+		last_symbol_word = "";
 		hide();
 		return;
 	}
 
+	if (symbol_word == last_symbol_word && is_visible()) {
+		return;
+	} else {
+		// Symbol has changed, reset the timer.
+		tooltip_delay->stop();
+		last_symbol_word = symbol_word;
+	}
+
 	_update_tooltip_size();
 
 	// Get the documentation of the word under the mouse cursor
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 46e690ab2e79..7f94fc93204f 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -46,7 +46,8 @@ class SymbolTooltip : public PopupPanel {
 	VBoxContainer *layout_container = nullptr;
 	RichTextLabel *header_label = nullptr;
 	RichTextLabel *body_label = nullptr;
-	Timer *tooltip_delay;
+	Timer *tooltip_delay = nullptr;
+	String last_symbol_word;
 
 	String _get_doc_of_word(const String &symbol_word);
 	void _update_header_label(const String &symbol_word);

From 77b839e958a5998c660a093af279b6cd287d28c2 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 29 Jul 2023 01:41:13 -0400
Subject: [PATCH 10/56] Stopped duplicating the body content for scroll
 testing.

---
 editor/symbol_tooltip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index e118e53dacae..60ed9ca49d4d 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -110,7 +110,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 
 	// Get the documentation of the word under the mouse cursor
 	String documentation = _get_doc_of_word(symbol_word);
-	_update_tooltip_content(symbol_word, documentation + documentation);
+	_update_tooltip_content(symbol_word, documentation);
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
 	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);

From c7406647b9a1888f729fe52d91104f4ef8c89495 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 30 Jul 2023 17:48:00 -0400
Subject: [PATCH 11/56] Update editor/symbol_tooltip.cpp

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
---
 editor/symbol_tooltip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 60ed9ca49d4d..049c16847f2a 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -33,7 +33,7 @@
 #include "editor_help.h"
 
 SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_editor) {
-	// Initialize the tooltip components
+	// Initialize the tooltip components.
 
 	// Set the tooltip's theme (PanelContainer's theme)
 	//set_theme(EditorNode::get_singleton()->get_gui_base()->get_theme());

From 1b412f85cddae14eb5567dba49eee8997e3fbd57 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 30 Jul 2023 20:06:00 -0400
Subject: [PATCH 12/56] Misc spelling/formatting fixes.

---
 editor/symbol_tooltip.h                                       | 2 +-
 .../gdscript/editor/gdscript_translation_parser_plugin.cpp    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 7f94fc93204f..07e9148f5f20 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -71,4 +71,4 @@ class SymbolTooltip : public PopupPanel {
 
 static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
 
-#endif //GODOT_SYMBOL_TOOLTIP_H
+#endif // GODOT_SYMBOL_TOOLTIP_H
diff --git a/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp b/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
index e17e748d7b92..b9b90bb93db0 100644
--- a/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
+++ b/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
@@ -39,7 +39,7 @@ void GDScriptEditorTranslationParserPlugin::get_recognized_extensions(List<Strin
 }
 
 Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Vector<String> *r_ids, Vector<Vector<String>> *r_ids_ctx_plural) {
-	// Extract all translatable strings using the parsed tree from GDSriptParser.
+	// Extract all translatable strings using the parsed tree from GDScriptParser.
 	// The strategy is to find all ExpressionNode and AssignmentNode from the tree and extract strings if relevant, i.e
 	// Search strings in ExpressionNode -> CallNode -> tr(), set_text(), set_placeholder() etc.
 	// Search strings in AssignmentNode -> text = "__", tooltip_text = "__" etc.
@@ -59,7 +59,7 @@ Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Ve
 	GDScriptParser parser;
 	err = parser.parse(source_code, p_path, false);
 	if (err != OK) {
-		ERR_PRINT("Failed to parse with GDScript with GDScriptParser.");
+		ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
 		return err;
 	}
 

From 2c6f0653a890cfa762dd7f75f86161af3234f08f Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 30 Jul 2023 22:14:13 -0400
Subject: [PATCH 13/56] Tooltip delay timer now derives wait time from the
 'gui/timers/tooltip_delay_sec' global setting.

---
 editor/symbol_tooltip.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 049c16847f2a..ac0de7f208eb 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "symbol_tooltip.h"
+#include "core/config/project_settings.h"
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
 
@@ -69,9 +70,10 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_edi
 	body_label->set_theme(_create_body_label_theme());
 	layout_container->add_child(body_label);
 
+	float tooltip_delay_time = ProjectSettings::get_singleton()->get("gui/timers/tooltip_delay_sec");
 	tooltip_delay = memnew(Timer);
 	tooltip_delay->set_one_shot(true);
-	tooltip_delay->set_wait_time(0.5);
+	tooltip_delay->set_wait_time(tooltip_delay_time);
 	add_child(tooltip_delay);
 
 	tooltip_delay->connect("timeout", callable_mp(this, &SymbolTooltip::_on_tooltip_delay_timeout));

From 25df5f8783b2e560b2926cf2c692e352860e61aa Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 31 Jul 2023 02:01:24 -0400
Subject: [PATCH 14/56] SymbolTooltip can now fetch the AST tree root node and
 the GDScriptParser list of DocumentSymbol members.

---
 editor/plugins/script_text_editor.cpp |  2 +-
 editor/symbol_tooltip.cpp             | 56 ++++++++++++++++++++++++++-
 editor/symbol_tooltip.h               | 10 +++--
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 4e20e9c060b9..c2ddaf7bfceb 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1869,7 +1869,7 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
 		local_pos = mb->get_global_position() - tx->get_global_position();
 		create_menu = true;
 	} else if (mm.is_valid()) {
-		symbol_tooltip->update_symbol_tooltip(mm->get_position());
+		symbol_tooltip->update_symbol_tooltip(mm->get_position(), script);
 	} else if (k.is_valid() && k->is_action("ui_menu", true)) {
 		tx->adjust_viewport_to_caret(0);
 		local_pos = tx->get_caret_draw_pos(0);
diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index ac0de7f208eb..52df0b34811e 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -90,7 +90,7 @@ void SymbolTooltip::_on_tooltip_delay_timeout() {
 	show();
 }
 
-void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
+void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script) {
 	CodeEdit *text_editor = code_editor->get_text_editor();
 	String symbol_word = _get_symbol_word(text_editor, mouse_position);
 	if (symbol_word.is_empty()) {
@@ -108,6 +108,12 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position) {
 		last_symbol_word = symbol_word;
 	}
 
+	//const GDScriptParser::ClassNode *ast_tree = get_ast_tree(script);
+
+	ExtendGDScriptParser *parser = get_script_parser(script);
+	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
+	const lsp::DocumentSymbol *member_symbol = parser->get_member_symbol(symbol_word);
+
 	_update_tooltip_size();
 
 	// Get the documentation of the word under the mouse cursor
@@ -302,3 +308,51 @@ static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Scri
 
 	return nullptr;
 }
+
+const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &symbol_word) {
+	for (int i = 0; i < node->members.size(); ++i) {
+		const GDScriptParser::ClassNode::Member &member = node->members[i];
+
+		if (member.get_name() == symbol_word) {
+			// Found the symbol.
+			return &member;
+		}
+		else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
+			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, symbol_word);
+			if (found_symbol) {
+				return found_symbol;
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+// Gets the head of the GDScriptParser AST tree.
+static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script) {
+	// Create and initialize the parser.
+	GDScriptParser *parser = memnew(GDScriptParser);
+	Error err = parser->parse(p_script->get_source_code(), p_script->get_path(), false);
+
+	if (err != OK) {
+		ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
+		return nullptr;
+	}
+
+	// Get the AST tree.
+	const GDScriptParser::ClassNode *ast_tree = parser->get_tree();
+	return ast_tree;
+}
+
+static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script) {
+	// Create and initialize the parser.
+	ExtendGDScriptParser *parser = memnew(ExtendGDScriptParser);
+	Error err = parser->parse(p_script->get_source_code(), p_script->get_path());
+
+	if (err != OK) {
+		ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
+		return nullptr;
+	}
+
+	return parser;
+}
\ No newline at end of file
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 07e9148f5f20..7e12f99246bb 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -33,6 +33,8 @@
 
 //#include "core/script_language.h"
 #include "code_editor.h"
+#include "modules/gdscript/gdscript_parser.h"
+#include "modules/gdscript/language_server/gdscript_extend_parser.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/rich_text_label.h"
@@ -40,7 +42,7 @@
 class SymbolTooltip : public PopupPanel {
 	GDCLASS(SymbolTooltip, PopupPanel);
 
-	//Ref<Script> script;
+	Ref<Script> script = nullptr;
 	CodeTextEditor *code_editor = nullptr;
 	PanelContainer *panel_container = nullptr;
 	VBoxContainer *layout_container = nullptr;
@@ -60,7 +62,7 @@ class SymbolTooltip : public PopupPanel {
 
 public:
 	void _on_tooltip_delay_timeout();
-	void update_symbol_tooltip(const Vector2 &mouse_position);
+	void update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script);
 	String _get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position);
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
 	void _update_tooltip_size();
@@ -70,5 +72,7 @@ class SymbolTooltip : public PopupPanel {
 };
 
 static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
+static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script);
+static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script);
 
-#endif // GODOT_SYMBOL_TOOLTIP_H
+#endif // SYMBOL_TOOLTIP_H

From 2961f93e519c32d32777381c6de74a4fec3be730 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 31 Jul 2023 02:39:03 -0400
Subject: [PATCH 15/56] Code style fixes + added member_symbol check.

---
 editor/symbol_tooltip.cpp | 18 ++++++++++++------
 editor/symbol_tooltip.h   |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 52df0b34811e..7c640985b4a6 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -33,7 +33,8 @@
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
 
-SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) : code_editor(code_editor) {
+SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) :
+			code_editor(code_editor) {
 	// Initialize the tooltip components.
 
 	// Set the tooltip's theme (PanelContainer's theme)
@@ -108,12 +109,18 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		last_symbol_word = symbol_word;
 	}
 
-	//const GDScriptParser::ClassNode *ast_tree = get_ast_tree(script);
-
 	ExtendGDScriptParser *parser = get_script_parser(script);
-	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
+	//HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
 	const lsp::DocumentSymbol *member_symbol = parser->get_member_symbol(symbol_word);
 
+	if (member_symbol == nullptr) {
+		tooltip_delay->stop();
+		hide();
+		return;
+	}
+
+	//const GDScriptParser::ClassNode *ast_tree = get_ast_tree(script);
+
 	_update_tooltip_size();
 
 	// Get the documentation of the word under the mouse cursor
@@ -316,8 +323,7 @@ const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::Class
 		if (member.get_name() == symbol_word) {
 			// Found the symbol.
 			return &member;
-		}
-		else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
+		} else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
 			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, symbol_word);
 			if (found_symbol) {
 				return found_symbol;
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 7e12f99246bb..715610b24e87 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -67,7 +67,7 @@ class SymbolTooltip : public PopupPanel {
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
 	void _update_tooltip_size();
 	void _update_tooltip_content(const String &header_content, const String &body_content);
-	SymbolTooltip(CodeTextEditor* code_editor);
+	SymbolTooltip(CodeTextEditor *code_editor);
 	~SymbolTooltip();
 };
 

From cfd817210bb5a63ae3911db04f99bc1a5b5e1225 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 31 Jul 2023 02:42:42 -0400
Subject: [PATCH 16/56] Code style fix...

---
 editor/symbol_tooltip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 7c640985b4a6..a840c7472956 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -34,7 +34,7 @@
 #include "editor_help.h"
 
 SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) :
-			code_editor(code_editor) {
+		code_editor(code_editor) {
 	// Initialize the tooltip components.
 
 	// Set the tooltip's theme (PanelContainer's theme)

From a15a40838dd3c468c11ef5619fa50d3d147d0432 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 31 Jul 2023 02:42:42 -0400
Subject: [PATCH 17/56] Code style fix...

---
 editor/symbol_tooltip.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 7c640985b4a6..76a76755bb2c 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -33,8 +33,8 @@
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
 
-SymbolTooltip::SymbolTooltip(CodeTextEditor* code_editor) :
-			code_editor(code_editor) {
+SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
+		code_editor(code_editor) {
 	// Initialize the tooltip components.
 
 	// Set the tooltip's theme (PanelContainer's theme)

From f67ebb6adce56880a70411db4d5b9792120898d3 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Wed, 2 Aug 2023 00:13:40 -0400
Subject: [PATCH 18/56] Now retrieve symbol information from DocumentSymbol
 objects.

---
 editor/symbol_tooltip.cpp | 55 ++++++++++++++++++++++++++++++++-------
 editor/symbol_tooltip.h   |  1 +
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 76a76755bb2c..2e6a8cb26fa3 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -32,6 +32,7 @@
 #include "core/config/project_settings.h"
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
+#include <queue>
 
 SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 		code_editor(code_editor) {
@@ -110,8 +111,8 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	}
 
 	ExtendGDScriptParser *parser = get_script_parser(script);
-	//HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
-	const lsp::DocumentSymbol *member_symbol = parser->get_member_symbol(symbol_word);
+	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
+	const lsp::DocumentSymbol *member_symbol = get_member_symbol(members, symbol_word);
 
 	if (member_symbol == nullptr) {
 		tooltip_delay->stop();
@@ -119,13 +120,16 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		return;
 	}
 
-	//const GDScriptParser::ClassNode *ast_tree = get_ast_tree(script);
-
 	_update_tooltip_size();
 
 	// Get the documentation of the word under the mouse cursor
-	String documentation = _get_doc_of_word(symbol_word);
-	_update_tooltip_content(symbol_word, documentation);
+	String official_documentation = _get_doc_of_word(symbol_word);
+	String comment_documentation = member_symbol->documentation;
+
+	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
+	String header_content = member_symbol->detail.is_empty() ? symbol_word : member_symbol->detail;
+	String body_content = comment_documentation;
+	_update_tooltip_content(header_content, body_content);
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
 	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
@@ -335,7 +339,7 @@ const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::Class
 }
 
 // Gets the head of the GDScriptParser AST tree.
-static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script) {
+/*static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script) {
 	// Create and initialize the parser.
 	GDScriptParser *parser = memnew(GDScriptParser);
 	Error err = parser->parse(p_script->get_source_code(), p_script->get_path(), false);
@@ -348,7 +352,7 @@ static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script
 	// Get the AST tree.
 	const GDScriptParser::ClassNode *ast_tree = parser->get_tree();
 	return ast_tree;
-}
+}*/
 
 static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script) {
 	// Create and initialize the parser.
@@ -361,4 +365,37 @@ static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script) {
 	}
 
 	return parser;
-}
\ No newline at end of file
+}
+
+// TODO: Need to find the correct symbol instance instead of just the first match.
+const lsp::DocumentSymbol *get_member_symbol(
+		HashMap<String, const lsp::DocumentSymbol *> &members,
+		const String &symbol_word) {//,
+		//const Vector2 &symbol_position) {
+	// Use a queue to implement breadth-first search
+	std::queue<const lsp::DocumentSymbol*> queue;
+
+	// Add all members to the queue
+	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : members) {
+		queue.push(E.value);
+	}
+
+	// While there are still elements in the queue
+	while (!queue.empty()) {
+		// Get the next symbol
+		const lsp::DocumentSymbol *symbol = queue.front();
+		queue.pop();
+
+		// If the name matches, return the symbol
+		if (symbol->name == symbol_word) { // && symbol->range.is_point_inside(symbol_position)) {
+			return symbol;
+		}
+
+		// Add the children to the queue for later processing
+		for (int i = 0; i < symbol->children.size(); ++i) {
+			queue.push(&symbol->children[i]);
+		}
+	}
+
+	return nullptr;  // If the symbol is not found, return nullptr
+}
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 715610b24e87..c21c98fae258 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -74,5 +74,6 @@ class SymbolTooltip : public PopupPanel {
 static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
 static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script);
 static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script);
+const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
 
 #endif // SYMBOL_TOOLTIP_H

From 0bfe8cd630574669b4ccc4ad408b6ac69e96c2af Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 4 Aug 2023 19:28:19 -0400
Subject: [PATCH 19/56] Enabled GDScript syntax highlighting for tooltip
 header.

---
 editor/symbol_tooltip.cpp | 22 ++++++++++++++++++----
 editor/symbol_tooltip.h   |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 2e6a8cb26fa3..fd456e4802cc 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -32,6 +32,7 @@
 #include "core/config/project_settings.h"
 #include "editor/plugins/script_text_editor.h"
 #include "editor_help.h"
+#include "modules/gdscript/editor/gdscript_highlighter.h"
 #include <queue>
 
 SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
@@ -55,9 +56,15 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	panel_container->add_child(layout_container);
 
 	// Create RichTextLabel for the tooltip's header
-	header_label = memnew(RichTextLabel);
-	header_label->set_use_bbcode(true);
-	header_label->set_selection_enabled(true);
+	header_label = memnew(TextEdit);
+	//header_label->set_readonly(true);
+	header_label->set_context_menu_enabled(false);
+	header_label->set_h_scroll(false);
+	header_label->set_v_scroll(false);
+	Ref<GDScriptSyntaxHighlighter> highlighter;
+	highlighter.instantiate();
+	header_label->set_syntax_highlighter(highlighter);
+	//header_label->set_selection_enabled(true);
 	header_label->set_custom_minimum_size(Size2(0, 50));
 	header_label->set_focus_mode(Control::FOCUS_ALL);
 	header_label->set_theme(_create_header_label_theme());
@@ -256,7 +263,14 @@ Ref<Theme> SymbolTooltip::_create_header_label_theme() {
 	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.27)); // Set the border color (RGBA)
 	style_box->set_border_width(SIDE_BOTTOM, 1);
 	style_box->set_content_margin_individual(15, 10, 15, 10);
-	theme->set_stylebox("normal", "RichTextLabel", style_box);
+
+	// Set the style boxes for the TextEdit
+	theme->set_stylebox("normal", "TextEdit", style_box);
+	theme->set_stylebox("focus", "TextEdit", style_box);
+	theme->set_stylebox("hover", "TextEdit", style_box);
+
+	// Set the color for the text
+	theme->set_color("font_color", "TextEdit", Color(1, 1, 1)); // Set the font color
 
 	return theme;
 }
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index c21c98fae258..13a8731fd08c 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -46,7 +46,7 @@ class SymbolTooltip : public PopupPanel {
 	CodeTextEditor *code_editor = nullptr;
 	PanelContainer *panel_container = nullptr;
 	VBoxContainer *layout_container = nullptr;
-	RichTextLabel *header_label = nullptr;
+	TextEdit *header_label = nullptr;
 	RichTextLabel *body_label = nullptr;
 	Timer *tooltip_delay = nullptr;
 	String last_symbol_word;

From 14d82ea30948e88ae63f2a815c949a8d11f5e607 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 4 Aug 2023 19:59:17 -0400
Subject: [PATCH 20/56] Comment punctuation fixes.

---
 editor/symbol_tooltip.cpp | 63 ++++++++++++++++++++-------------------
 editor/symbol_tooltip.h   |  1 -
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index fd456e4802cc..ec71cf6db502 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -51,11 +51,11 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	panel_container->set_theme(_create_panel_theme());
 	add_child(panel_container);
 
-	// Create VBoxContainer to hold the tooltip's header and body
+	// Create VBoxContainer to hold the tooltip's header and body.
 	layout_container = memnew(VBoxContainer);
 	panel_container->add_child(layout_container);
 
-	// Create RichTextLabel for the tooltip's header
+	// Create RichTextLabel for the tooltip's header.
 	header_label = memnew(TextEdit);
 	//header_label->set_readonly(true);
 	header_label->set_context_menu_enabled(false);
@@ -70,7 +70,7 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	header_label->set_theme(_create_header_label_theme());
 	layout_container->add_child(header_label);
 
-	// Create RichTextLabel for the tooltip's body
+	// Create RichTextLabel for the tooltip's body.
 	body_label = memnew(RichTextLabel);
 	body_label->set_use_bbcode(true);
 	body_label->set_selection_enabled(true);
@@ -87,7 +87,7 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 
 	tooltip_delay->connect("timeout", callable_mp(this, &SymbolTooltip::_on_tooltip_delay_timeout));
 
-	// Connect the tooltip's update function to the mouse motion signal
+	// Connect the tooltip's update function to the mouse motion signal.
 	// connect("mouse_motion", callable_mp(this, &SymbolTooltip::_update_symbol_tooltip));
 }
 
@@ -129,7 +129,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 
 	_update_tooltip_size();
 
-	// Get the documentation of the word under the mouse cursor
+	// Get the documentation of the word under the mouse cursor.
 	String official_documentation = _get_doc_of_word(symbol_word);
 	String comment_documentation = member_symbol->documentation;
 
@@ -147,16 +147,18 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 			hide();
 			return;
 		} else {
+			//Vector2 symbol_position = tooltip_position - text_editor->get_screen_position();
+			//Vector2 temp_line_col = text_editor->get_line_column_at_pos(symbol_position);
 			set_position(tooltip_position);
 		}
 	}
 
-	// Start the timer to show the tooltip after a delay
+	// Start the timer to show the tooltip after a delay.
 	tooltip_delay->start();
 }
 
 String SymbolTooltip::_get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position) {
-	// Get the word under the mouse cursor
+	// Get the word under the mouse cursor.
 	return text_editor->get_word_at_pos(mouse_position);
 }
 
@@ -174,27 +176,28 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 			return text_editor->get_screen_position() + symbol_position;
 		}
 	}
-	return Vector2(-1, -1); // indicates an invalid position
+	return Vector2(-1, -1); // Indicates an invalid position.
 }
 
 void SymbolTooltip::_update_tooltip_size() {
-	// Calculate and set the tooltip's size
+	// Calculate and set the tooltip's size.
 	set_size(Vector2(600, 300));
 }
 
 void SymbolTooltip::_update_tooltip_content(const String &header_content, const String &body_content) {
-	// Update the tooltip's header and body
+	// Update the tooltip's header and body.
 	_update_header_label(header_content);
 	_update_body_label(body_content);
 }
 
 void SymbolTooltip::_update_header_label(const String &header_content) {
-	// Set the tooltip's header text
+	// Set the tooltip's header text.
+	//Ref<SyntaxHighlighter> highlighter = code_editor->get_text_editor()->get_syntax_highlighter();
 	header_label->set_text(header_content);
 }
 
 void SymbolTooltip::_update_body_label(const String &body_content) {
-	// Set the tooltip's body text
+	// Set the tooltip's body text.
 	body_label->clear();
 	_add_text_to_rt(body_content, body_label, layout_container);
 }
@@ -235,20 +238,20 @@ Ref<Theme> SymbolTooltip::_create_popup_panel_theme() {
 	Ref<Theme> theme = memnew(Theme);
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
-	style_box->set_bg_color(Color(0, 0, 0, 0)); // Set the background color (RGBA)
+	style_box->set_bg_color(Color(0, 0, 0, 0)); // Set the background color (RGBA).
 	theme->set_stylebox("panel", "PopupPanel", style_box);
 
 	return theme;
 }
 
 Ref<Theme> SymbolTooltip::_create_panel_theme() {
-	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
+	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode).
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
-	style_box->set_bg_color(Color().html("#363d4a")); // Set the background color (RGBA)
-	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.47)); // Set the border color (RGBA)
-	style_box->set_border_width_all(1); // Set the border width
-	style_box->set_corner_radius_all(4); // Set the border radius for curved corners
+	style_box->set_bg_color(Color().html("#363d4a")); // Set the background color (RGBA).
+	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.47)); // Set the border color (RGBA).
+	style_box->set_border_width_all(1); // Set the border width.
+	style_box->set_corner_radius_all(4); // Set the border radius for curved corners.
 	//style_box->set_content_margin_all(20);
 	theme->set_stylebox("panel", "PanelContainer", style_box);
 
@@ -256,11 +259,11 @@ Ref<Theme> SymbolTooltip::_create_panel_theme() {
 }
 
 Ref<Theme> SymbolTooltip::_create_header_label_theme() {
-	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
+	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode).
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
 	style_box->set_draw_center(false);
-	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.27)); // Set the border color (RGBA)
+	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.27)); // Set the border color (RGBA).
 	style_box->set_border_width(SIDE_BOTTOM, 1);
 	style_box->set_content_margin_individual(15, 10, 15, 10);
 
@@ -269,14 +272,14 @@ Ref<Theme> SymbolTooltip::_create_header_label_theme() {
 	theme->set_stylebox("focus", "TextEdit", style_box);
 	theme->set_stylebox("hover", "TextEdit", style_box);
 
-	// Set the color for the text
-	theme->set_color("font_color", "TextEdit", Color(1, 1, 1)); // Set the font color
+	// Set the font color.
+	theme->set_color("font_color", "TextEdit", Color(1, 1, 1));
 
 	return theme;
 }
 
 Ref<Theme> SymbolTooltip::_create_body_label_theme() {
-	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode)
+	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode).
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
 	style_box->set_draw_center(false);
@@ -386,30 +389,30 @@ const lsp::DocumentSymbol *get_member_symbol(
 		HashMap<String, const lsp::DocumentSymbol *> &members,
 		const String &symbol_word) {//,
 		//const Vector2 &symbol_position) {
-	// Use a queue to implement breadth-first search
+	// Use a queue to implement breadth-first search.
 	std::queue<const lsp::DocumentSymbol*> queue;
 
-	// Add all members to the queue
+	// Add all members to the queue.
 	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : members) {
 		queue.push(E.value);
 	}
 
-	// While there are still elements in the queue
+	// While there are still elements in the queue.
 	while (!queue.empty()) {
-		// Get the next symbol
+		// Get the next symbol.
 		const lsp::DocumentSymbol *symbol = queue.front();
 		queue.pop();
 
-		// If the name matches, return the symbol
+		// If the name matches, return the symbol.
 		if (symbol->name == symbol_word) { // && symbol->range.is_point_inside(symbol_position)) {
 			return symbol;
 		}
 
-		// Add the children to the queue for later processing
+		// Add the children to the queue for later processing.
 		for (int i = 0; i < symbol->children.size(); ++i) {
 			queue.push(&symbol->children[i]);
 		}
 	}
 
-	return nullptr;  // If the symbol is not found, return nullptr
+	return nullptr;  // If the symbol is not found, return nullptr.
 }
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 13a8731fd08c..f6782debc33e 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -31,7 +31,6 @@
 #ifndef SYMBOL_TOOLTIP_H
 #define SYMBOL_TOOLTIP_H
 
-//#include "core/script_language.h"
 #include "code_editor.h"
 #include "modules/gdscript/gdscript_parser.h"
 #include "modules/gdscript/language_server/gdscript_extend_parser.h"

From 30af6a0321aad1b33849d658cd9b0a57ed3a2191 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 4 Aug 2023 22:50:39 -0400
Subject: [PATCH 21/56] Retrieved DocumentSymbol member should now always be
 the original.

---
 editor/symbol_tooltip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index ec71cf6db502..724f5e761cc0 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -404,7 +404,7 @@ const lsp::DocumentSymbol *get_member_symbol(
 		queue.pop();
 
 		// If the name matches, return the symbol.
-		if (symbol->name == symbol_word) { // && symbol->range.is_point_inside(symbol_position)) {
+		if (symbol->name == symbol_word && !symbol->detail.is_empty()) { // && symbol->range.is_point_inside(symbol_position)) {
 			return symbol;
 		}
 

From 26b0137b953ff97cf09c72b4b0df4e18b7417fff Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 4 Aug 2023 22:54:13 -0400
Subject: [PATCH 22/56] Fixed the formatting of document comments within the
 tooltip body.

---
 editor/symbol_tooltip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 724f5e761cc0..434985ecec98 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -135,7 +135,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 
 	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
 	String header_content = member_symbol->detail.is_empty() ? symbol_word : member_symbol->detail;
-	String body_content = comment_documentation;
+	String body_content = comment_documentation.replace("\n ", " ");
 	_update_tooltip_content(header_content, body_content);
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());

From ef19c736d8aa6b28d107bfa2165cc328e6796b24 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 4 Aug 2023 22:58:26 -0400
Subject: [PATCH 23/56] GDScriptParser::DataType::to_string() now returns
 'void' instead of 'null'.

---
 modules/gdscript/gdscript_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 2b91ba8f860f..52aeb40cc792 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -4244,7 +4244,7 @@ String GDScriptParser::DataType::to_string() const {
 			return "Variant";
 		case BUILTIN:
 			if (builtin_type == Variant::NIL) {
-				return "null";
+				return "void";
 			}
 			if (builtin_type == Variant::ARRAY && has_container_element_type()) {
 				return vformat("Array[%s]", container_element_type->to_string());

From 0d96a7ae53b381b8413da773bb33146683ba7cff Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 00:49:54 -0400
Subject: [PATCH 24/56] Added a 'reduced_detail' property to DocumentSymbol for
 a more restrictive version of the 'detail' property.

---
 editor/symbol_tooltip.cpp                                 | 2 +-
 .../gdscript/language_server/gdscript_extend_parser.cpp   | 8 ++++++++
 modules/gdscript/language_server/godot_lsp.h              | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 434985ecec98..67490dcfcd45 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -134,7 +134,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	String comment_documentation = member_symbol->documentation;
 
 	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
-	String header_content = member_symbol->detail.is_empty() ? symbol_word : member_symbol->detail;
+	String header_content = member_symbol->reduced_detail.is_empty() ? symbol_word : member_symbol->reduced_detail;
 	String body_content = comment_documentation.replace("\n ", " ");
 	_update_tooltip_content(header_content, body_content);
 
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 3a5a54e275ee..ca4005a53f94 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -154,6 +154,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 	r_symbol.range.end.line = lines.size();
 	r_symbol.selectionRange.start.line = r_symbol.range.start.line;
 	r_symbol.detail = "class " + r_symbol.name;
+	r_symbol.reduced_detail = r_symbol.detail;
 	bool is_root_class = &r_symbol == &class_symbol;
 	r_symbol.documentation = parse_documentation(is_root_class ? 0 : LINE_NUMBER_TO_INDEX(p_class->start_line), is_root_class);
 
@@ -178,6 +179,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				if (m.get_datatype().is_hard_type()) {
 					symbol.detail += ": " + m.get_datatype().to_string();
 				}
+				symbol.reduced_detail = symbol.detail;
 				if (m.variable->initializer != nullptr && m.variable->initializer->is_constant) {
 					symbol.detail += " = " + m.variable->initializer->reduced_value.to_json_string();
 				}
@@ -207,6 +209,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				if (m.constant->get_datatype().is_hard_type()) {
 					symbol.detail += ": " + m.constant->get_datatype().to_string();
 				}
+				symbol.reduced_detail = symbol.detail;
 
 				const Variant &default_value = m.constant->initializer->reduced_value;
 				String value_text;
@@ -247,6 +250,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				symbol.script_path = path;
 
 				symbol.detail = symbol.name + " = " + itos(m.enum_value.value);
+				symbol.reduced_detail = symbol.detail;
 
 				r_symbol.children.push_back(symbol);
 			} break;
@@ -271,6 +275,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 					symbol.detail += m.signal->parameters[j]->identifier->name;
 				}
 				symbol.detail += ")";
+				symbol.reduced_detail = symbol.detail;
 
 				r_symbol.children.push_back(symbol);
 			} break;
@@ -294,6 +299,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 					symbol.detail += String(m.m_enum->values[j].identifier->name) + " = " + itos(m.m_enum->values[j].value);
 				}
 				symbol.detail += "}";
+				symbol.reduced_detail = "enum " + String(m.m_enum->identifier->name);
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::FUNCTION: {
@@ -358,6 +364,7 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 	if (p_func->get_datatype().is_hard_type()) {
 		r_symbol.detail += " -> " + p_func->get_datatype().to_string();
 	}
+	r_symbol.reduced_detail = r_symbol.detail;
 
 	List<GDScriptParser::SuiteNode *> function_nodes;
 
@@ -437,6 +444,7 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 			if (local.get_datatype().is_hard_type()) {
 				symbol.detail += ": " + local.get_datatype().to_string();
 			}
+			symbol.reduced_detail = symbol.detail;
 			symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(local.start_line));
 			r_symbol.children.push_back(symbol);
 		}
diff --git a/modules/gdscript/language_server/godot_lsp.h b/modules/gdscript/language_server/godot_lsp.h
index b9a54cf818a7..5923397cac80 100644
--- a/modules/gdscript/language_server/godot_lsp.h
+++ b/modules/gdscript/language_server/godot_lsp.h
@@ -1185,6 +1185,11 @@ struct DocumentSymbol {
 	 */
 	String detail;
 
+	/**
+	 * More detail for this symbol - without values, e.g the signature of a function.
+	 */
+	String reduced_detail;
+
 	/**
 	 * Documentation for this symbol
 	 */

From b441e3d9badbf12d88979a6d3ee9c397ea6b2b58 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 00:50:45 -0400
Subject: [PATCH 25/56] Added the parameter types to the DocumentSymbol
 'detail' and 'reduced_detail' for signals.

---
 modules/gdscript/language_server/gdscript_extend_parser.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index ca4005a53f94..9410d44d3cf0 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -269,10 +269,14 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				symbol.script_path = path;
 				symbol.detail = "signal " + String(m.signal->identifier->name) + "(";
 				for (int j = 0; j < m.signal->parameters.size(); j++) {
+					const ParameterNode *parameter = m.signal->parameters[j];
 					if (j > 0) {
 						symbol.detail += ", ";
 					}
-					symbol.detail += m.signal->parameters[j]->identifier->name;
+					symbol.detail += parameter->identifier->name;
+					if (parameter->get_datatype().is_hard_type()) {
+						symbol.detail += ": " + parameter->get_datatype().to_string();
+					}
 				}
 				symbol.detail += ")";
 				symbol.reduced_detail = symbol.detail;

From 6a5e6567b80ddcec3f43457ec0227721c8ce5ca3 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 00:51:19 -0400
Subject: [PATCH 26/56] The DocumentSymbol 'name' is now populated for enums.

---
 modules/gdscript/language_server/gdscript_extend_parser.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 9410d44d3cf0..1b533aa0b472 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -285,6 +285,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 			} break;
 			case ClassNode::Member::ENUM: {
 				lsp::DocumentSymbol symbol;
+				symbol.name = m.m_enum->identifier->name;
 				symbol.kind = lsp::SymbolKind::Enum;
 				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.m_enum->start_line);
 				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.m_enum->start_column);

From 223c52bb78e1cddb089c1770ddd68f43542e2f17 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 01:22:38 -0400
Subject: [PATCH 27/56] The '_init' function will now have a 'void' return type
 instead of the type of the class.

---
 modules/gdscript/language_server/gdscript_extend_parser.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 1b533aa0b472..dc9832e0637b 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -366,10 +366,13 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 		}
 	}
 	r_symbol.detail += parameters + ")";
+	r_symbol.reduced_detail = r_symbol.detail;
 	if (p_func->get_datatype().is_hard_type()) {
 		r_symbol.detail += " -> " + p_func->get_datatype().to_string();
+
+		String return_type = r_symbol.name == "_init" ? "void" : p_func->get_datatype().to_string();
+		r_symbol.reduced_detail += " -> " + return_type;
 	}
-	r_symbol.reduced_detail = r_symbol.detail;
 
 	List<GDScriptParser::SuiteNode *> function_nodes;
 

From 790d563579dd5b498cd17451145f50aefff96272 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 12:23:46 -0400
Subject: [PATCH 28/56] Added the ability to disable scrollbars on TextEdit
 nodes.

---
 editor/symbol_tooltip.cpp |  4 ++--
 scene/gui/text_edit.cpp   | 12 ++++++++++--
 scene/gui/text_edit.h     |  5 +++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 67490dcfcd45..8453767c3991 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -59,8 +59,8 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	header_label = memnew(TextEdit);
 	//header_label->set_readonly(true);
 	header_label->set_context_menu_enabled(false);
-	header_label->set_h_scroll(false);
-	header_label->set_v_scroll(false);
+	header_label->set_h_scroll_visibility(false);
+	header_label->set_v_scroll_visibility(false);
 	Ref<GDScriptSyntaxHighlighter> highlighter;
 	highlighter.instantiate();
 	header_label->set_syntax_highlighter(highlighter);
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 3b2013f7ecfb..19b8b26c6e9d 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -5380,6 +5380,14 @@ HScrollBar *TextEdit::get_h_scroll_bar() const {
 	return h_scroll;
 }
 
+void TextEdit::set_v_scroll_visibility(bool p_visible) {
+	v_scroll_enabled = p_visible;
+}
+
+void TextEdit::set_h_scroll_visibility(bool p_visible) {
+	h_scroll_enabled = p_visible;
+}
+
 void TextEdit::set_v_scroll(double p_scroll) {
 	v_scroll->set_value(p_scroll);
 	int max_v_scroll = v_scroll->get_max() - v_scroll->get_page();
@@ -7314,7 +7322,7 @@ void TextEdit::_update_scrollbars() {
 
 	updating_scrolls = true;
 
-	if (total_rows > visible_rows) {
+	if (total_rows > visible_rows && v_scroll_enabled) {
 		v_scroll->show();
 		v_scroll->set_max(total_rows + _get_visible_lines_offset());
 		v_scroll->set_page(visible_rows + _get_visible_lines_offset());
@@ -7333,7 +7341,7 @@ void TextEdit::_update_scrollbars() {
 		v_scroll->hide();
 	}
 
-	if (total_width > visible_width) {
+	if (total_width > visible_width && h_scroll_enabled) {
 		h_scroll->show();
 		h_scroll->set_max(total_width);
 		h_scroll->set_page(visible_width);
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index 83f6d58bea1e..9b889011ba59 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -474,6 +474,9 @@ class TextEdit : public Control {
 	HScrollBar *h_scroll = nullptr;
 	VScrollBar *v_scroll = nullptr;
 
+	bool h_scroll_enabled = true;
+	bool v_scroll_enabled = true;
+
 	float content_height_cache = 0.0;
 	bool fit_content_height = false;
 	bool scroll_past_end_of_file_enabled = false;
@@ -918,9 +921,11 @@ class TextEdit : public Control {
 	VScrollBar *get_v_scroll_bar() const;
 	HScrollBar *get_h_scroll_bar() const;
 
+	void set_v_scroll_visibility(bool p_enabled);
 	void set_v_scroll(double p_scroll);
 	double get_v_scroll() const;
 
+	void set_h_scroll_visibility(bool p_enabled);
 	void set_h_scroll(int p_scroll);
 	int get_h_scroll() const;
 

From 98f8ecbdc25a1f44f083029980efa46b0cfdca2d Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 20:31:49 -0400
Subject: [PATCH 29/56] Added ENUM values as ENUM_VALUE child members.

---
 .../gdscript_extend_parser.cpp                | 56 ++++++++++++-------
 .../language_server/gdscript_extend_parser.h  |  1 +
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index dc9832e0637b..d33614a592d4 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -234,26 +234,6 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 
 				r_symbol.children.push_back(symbol);
 			} break;
-			case ClassNode::Member::ENUM_VALUE: {
-				lsp::DocumentSymbol symbol;
-
-				symbol.name = m.enum_value.identifier->name;
-				symbol.kind = lsp::SymbolKind::EnumMember;
-				symbol.deprecated = false;
-				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.enum_value.line);
-				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.enum_value.leftmost_column);
-				symbol.range.end.line = LINE_NUMBER_TO_INDEX(m.enum_value.line);
-				symbol.range.end.character = LINE_NUMBER_TO_INDEX(m.enum_value.rightmost_column);
-				symbol.selectionRange.start.line = LINE_NUMBER_TO_INDEX(m.enum_value.line);
-				symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(m.enum_value.line));
-				symbol.uri = uri;
-				symbol.script_path = path;
-
-				symbol.detail = symbol.name + " = " + itos(m.enum_value.value);
-				symbol.reduced_detail = symbol.detail;
-
-				r_symbol.children.push_back(symbol);
-			} break;
 			case ClassNode::Member::SIGNAL: {
 				lsp::DocumentSymbol symbol;
 				symbol.name = m.signal->identifier->name;
@@ -301,12 +281,22 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 					if (j > 0) {
 						symbol.detail += ", ";
 					}
-					symbol.detail += String(m.m_enum->values[j].identifier->name) + " = " + itos(m.m_enum->values[j].value);
+					const EnumNode::Value *enum_value = &m.m_enum->values[j];
+					symbol.detail += String(enum_value->identifier->name) + " = " + itos(enum_value->value);
+
+					lsp::DocumentSymbol ev_symbol;
+					parse_enum_value_symbol(enum_value, ev_symbol);
+					r_symbol.children.push_back(ev_symbol);
 				}
 				symbol.detail += "}";
 				symbol.reduced_detail = "enum " + String(m.m_enum->identifier->name);
 				r_symbol.children.push_back(symbol);
 			} break;
+			case ClassNode::Member::ENUM_VALUE: {
+				lsp::DocumentSymbol symbol;
+				parse_enum_value_symbol(&m.enum_value, symbol);
+				r_symbol.children.push_back(symbol);
+			} break;
 			case ClassNode::Member::FUNCTION: {
 				lsp::DocumentSymbol symbol;
 				parse_function_symbol(m.function, symbol);
@@ -325,6 +315,30 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 	}
 }
 
+void ExtendGDScriptParser::parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol &r_symbol) {
+	const String uri = get_uri();
+
+	r_symbol.name = p_value->identifier->name;
+	r_symbol.kind = lsp::SymbolKind::EnumMember;
+	r_symbol.deprecated = false;
+	r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_value->line);
+	r_symbol.range.start.character = LINE_NUMBER_TO_INDEX(p_value->leftmost_column);
+	r_symbol.range.end.line = LINE_NUMBER_TO_INDEX(p_value->line);
+	r_symbol.range.end.character = LINE_NUMBER_TO_INDEX(p_value->rightmost_column);
+	r_symbol.selectionRange.start.line = LINE_NUMBER_TO_INDEX(p_value->line);
+	r_symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(p_value->line));
+	r_symbol.uri = uri;
+	r_symbol.script_path = path;
+
+	if (p_value->parent_enum != nullptr) {
+		r_symbol.detail = String(p_value->parent_enum->identifier->name) + "." + r_symbol.name + " = " + itos(p_value->value);
+	} else {
+		r_symbol.detail = r_symbol.name + " = " + itos(p_value->value);;
+	}
+
+	r_symbol.reduced_detail = r_symbol.detail;
+}
+
 void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol) {
 	const String uri = get_uri();
 
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.h b/modules/gdscript/language_server/gdscript_extend_parser.h
index 4fd27de08199..90a795a0a50c 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.h
+++ b/modules/gdscript/language_server/gdscript_extend_parser.h
@@ -65,6 +65,7 @@ class ExtendGDScriptParser : public GDScriptParser {
 	void update_symbols();
 	void update_document_links(const String &p_code);
 	void parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol &r_symbol);
+	void parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol &r_symbol);
 	void parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol);
 
 	Dictionary dump_function_api(const GDScriptParser::FunctionNode *p_func) const;

From 27eb768aedbac1df87e10b4714f5a99acde0a4cf Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 5 Aug 2023 21:12:57 -0400
Subject: [PATCH 30/56] Fixed if condition.

---
 modules/gdscript/language_server/gdscript_extend_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index d33614a592d4..4e2cbbbebe17 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -330,7 +330,7 @@ void ExtendGDScriptParser::parse_enum_value_symbol(const GDScriptParser::EnumNod
 	r_symbol.uri = uri;
 	r_symbol.script_path = path;
 
-	if (p_value->parent_enum != nullptr) {
+	if (p_value->parent_enum->identifier != nullptr) {
 		r_symbol.detail = String(p_value->parent_enum->identifier->name) + "." + r_symbol.name + " = " + itos(p_value->value);
 	} else {
 		r_symbol.detail = r_symbol.name + " = " + itos(p_value->value);;

From a7e7ddf411e0f854ba3807ee79a7c46779998df8 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 6 Aug 2023 17:11:00 -0400
Subject: [PATCH 31/56] Added a nullptr check.

---
 editor/plugins/script_text_editor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index c2ddaf7bfceb..35ddd58b5b06 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1869,7 +1869,9 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
 		local_pos = mb->get_global_position() - tx->get_global_position();
 		create_menu = true;
 	} else if (mm.is_valid()) {
-		symbol_tooltip->update_symbol_tooltip(mm->get_position(), script);
+		if (script->is_valid() && (script->has_source_code() || script->get_path().is_resource_file())) {
+			symbol_tooltip->update_symbol_tooltip(mm->get_position(), script);
+		}
 	} else if (k.is_valid() && k->is_action("ui_menu", true)) {
 		tx->adjust_viewport_to_caret(0);
 		local_pos = tx->get_caret_draw_pos(0);

From 2060968dbc55ef8a75912954844fccd46ab3f3cf Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Tue, 8 Aug 2023 00:42:01 -0400
Subject: [PATCH 32/56] Tooltip size now adapts to its contents - including the
 conditional visibility of the template body.

---
 editor/symbol_tooltip.cpp | 50 +++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 8453767c3991..1de9e787b099 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -39,14 +39,20 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 		code_editor(code_editor) {
 	// Initialize the tooltip components.
 
+	Ref<GDScriptSyntaxHighlighter> highlighter;
+	highlighter.instantiate();
+
 	// Set the tooltip's theme (PanelContainer's theme)
 	//set_theme(EditorNode::get_singleton()->get_gui_base()->get_theme());
 
+	//set_min_size(Vector2(100, 50));
 	set_transient(true);
 	set_flag(Window::FLAG_NO_FOCUS, true);
 	set_flag(Window::FLAG_POPUP, false);
 	set_flag(Window::FLAG_MOUSE_PASSTHROUGH, false);
 	set_theme(_create_popup_panel_theme());
+
+	// Create PanelContainer for styling the tooltip.
 	panel_container = memnew(PanelContainer);
 	panel_container->set_theme(_create_panel_theme());
 	add_child(panel_container);
@@ -57,16 +63,16 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 
 	// Create RichTextLabel for the tooltip's header.
 	header_label = memnew(TextEdit);
-	//header_label->set_readonly(true);
+	//header_label->set_editable(false); // WARNING!! - Enabling this will mess with the theme.
+	header_label->set_focus_mode(Control::FOCUS_ALL);
 	header_label->set_context_menu_enabled(false);
 	header_label->set_h_scroll_visibility(false);
 	header_label->set_v_scroll_visibility(false);
-	Ref<GDScriptSyntaxHighlighter> highlighter;
-	highlighter.instantiate();
 	header_label->set_syntax_highlighter(highlighter);
 	//header_label->set_selection_enabled(true);
-	header_label->set_custom_minimum_size(Size2(0, 50));
-	header_label->set_focus_mode(Control::FOCUS_ALL);
+	header_label->set_custom_minimum_size(Size2(50, 45));
+	//header_label->set_line_wrapping_mode(TextEdit::LINE_WRAPPING_BOUNDARY);
+	//header_label->set_fit_content_height_enabled(true);
 	header_label->set_theme(_create_header_label_theme());
 	layout_container->add_child(header_label);
 
@@ -74,6 +80,7 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	body_label = memnew(RichTextLabel);
 	body_label->set_use_bbcode(true);
 	body_label->set_selection_enabled(true);
+	body_label->set_custom_minimum_size(Size2(400, 100));
 	body_label->set_focus_mode(Control::FOCUS_ALL);
 	body_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	body_label->set_theme(_create_body_label_theme());
@@ -127,8 +134,6 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		return;
 	}
 
-	_update_tooltip_size();
-
 	// Get the documentation of the word under the mouse cursor.
 	String official_documentation = _get_doc_of_word(symbol_word);
 	String comment_documentation = member_symbol->documentation;
@@ -137,6 +142,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	String header_content = member_symbol->reduced_detail.is_empty() ? symbol_word : member_symbol->reduced_detail;
 	String body_content = comment_documentation.replace("\n ", " ");
 	_update_tooltip_content(header_content, body_content);
+	_update_tooltip_size();
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
 	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
@@ -181,7 +187,26 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 
 void SymbolTooltip::_update_tooltip_size() {
 	// Calculate and set the tooltip's size.
-	set_size(Vector2(600, 300));
+	Ref<Theme> header_theme = header_label->get_theme();
+	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
+	String header_text = header_label->get_text();
+
+	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
+	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+
+	real_t h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT) + 2;
+	real_t v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM) + 1 + 2;
+	real_t height = header_content_size.height;
+
+	Vector2 body_size = body_label->get_size();
+	if (body_label->is_visible()) {
+		height += body_size.height;
+	}
+
+	real_t tooltip_width = MAX(header_content_size.width + h_padding, body_label->is_visible() ? body_size.width : 0 );
+	real_t tooltip_height = height + v_padding;
+	set_size(Vector2(tooltip_width, tooltip_height));
 }
 
 void SymbolTooltip::_update_tooltip_content(const String &header_content, const String &body_content) {
@@ -198,8 +223,13 @@ void SymbolTooltip::_update_header_label(const String &header_content) {
 
 void SymbolTooltip::_update_body_label(const String &body_content) {
 	// Set the tooltip's body text.
+	if (body_content.is_empty()) {
+		body_label->hide();
+		return;
+	}
 	body_label->clear();
 	_add_text_to_rt(body_content, body_label, layout_container);
+	body_label->show();
 }
 
 String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
@@ -238,7 +268,7 @@ Ref<Theme> SymbolTooltip::_create_popup_panel_theme() {
 	Ref<Theme> theme = memnew(Theme);
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
-	style_box->set_bg_color(Color(0, 0, 0, 0)); // Set the background color (RGBA).
+	style_box->set_draw_center(false);
 	theme->set_stylebox("panel", "PopupPanel", style_box);
 
 	return theme;
@@ -270,7 +300,7 @@ Ref<Theme> SymbolTooltip::_create_header_label_theme() {
 	// Set the style boxes for the TextEdit
 	theme->set_stylebox("normal", "TextEdit", style_box);
 	theme->set_stylebox("focus", "TextEdit", style_box);
-	theme->set_stylebox("hover", "TextEdit", style_box);
+	theme->set_stylebox("readonly", "TextEdit", style_box);
 
 	// Set the font color.
 	theme->set_color("font_color", "TextEdit", Color(1, 1, 1));

From 29e07cfcfdf30577933263dc9dbcaf14f2590ef0 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Wed, 9 Aug 2023 00:21:10 -0400
Subject: [PATCH 33/56] Partially implemented max width with line wrapping in
 header.

---
 editor/symbol_tooltip.cpp | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 1de9e787b099..192c47e4432a 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -84,6 +84,7 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	body_label->set_focus_mode(Control::FOCUS_ALL);
 	body_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	body_label->set_theme(_create_body_label_theme());
+	body_label->hide();
 	layout_container->add_child(body_label);
 
 	float tooltip_delay_time = ProjectSettings::get_singleton()->get("gui/timers/tooltip_delay_sec");
@@ -187,6 +188,7 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 
 void SymbolTooltip::_update_tooltip_size() {
 	// Calculate and set the tooltip's size.
+	int max_width = 800;
 	Ref<Theme> header_theme = header_label->get_theme();
 	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
 	String header_text = header_label->get_text();
@@ -195,16 +197,29 @@ void SymbolTooltip::_update_tooltip_size() {
 	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
 	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
 
+	bool need_to_wrap = header_content_size.width > max_width;
+	TextEdit::LineWrappingMode line_wrapping_mode = need_to_wrap ? TextEdit::LINE_WRAPPING_BOUNDARY : TextEdit::LINE_WRAPPING_NONE;
+	if (header_label->get_line_wrapping_mode() != line_wrapping_mode) {
+		header_label->set_line_wrapping_mode(line_wrapping_mode);
+		header_label->set_fit_content_height_enabled(need_to_wrap); // TODO: Fix issue where the tooltip height renders incorrectly when this is enabled and line wrapping is occurring.
+	}
+
+	real_t lines_after_wrapping = header_content_size.width / max_width;
+	real_t line_height = font->get_height(font_size);
+	real_t wrapped_height = line_height * lines_after_wrapping;
+
 	real_t h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT) + 2;
-	real_t v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM) + 1 + 2;
-	real_t height = header_content_size.height;
+	real_t v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM) + 2;
+	real_t header_height = need_to_wrap ? wrapped_height : header_content_size.height;
+	real_t height = header_height;
 
 	Vector2 body_size = body_label->get_size();
 	if (body_label->is_visible()) {
 		height += body_size.height;
+		v_padding += 1;
 	}
 
-	real_t tooltip_width = MAX(header_content_size.width + h_padding, body_label->is_visible() ? body_size.width : 0 );
+	real_t tooltip_width = MAX(MIN(max_width, header_content_size.width + h_padding), body_label->is_visible() ? body_size.width : 0 );
 	real_t tooltip_height = height + v_padding;
 	set_size(Vector2(tooltip_width, tooltip_height));
 }
@@ -224,12 +239,16 @@ void SymbolTooltip::_update_header_label(const String &header_content) {
 void SymbolTooltip::_update_body_label(const String &body_content) {
 	// Set the tooltip's body text.
 	if (body_content.is_empty()) {
-		body_label->hide();
+		if (body_label->is_visible()) {
+			body_label->hide();
+		}
 		return;
 	}
 	body_label->clear();
 	_add_text_to_rt(body_content, body_label, layout_container);
-	body_label->show();
+	if (!body_label->is_visible()) {
+		body_label->show();
+	}
 }
 
 String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
@@ -293,9 +312,9 @@ Ref<Theme> SymbolTooltip::_create_header_label_theme() {
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
 	style_box->set_draw_center(false);
-	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.27)); // Set the border color (RGBA).
-	style_box->set_border_width(SIDE_BOTTOM, 1);
 	style_box->set_content_margin_individual(15, 10, 15, 10);
+	// TODO: The horizontal scrollbar may still be taking up space even when invisible??  Something is adding unwanted bottom margin.
+	// TODO: Besides the small bottom unwanted margin, there is still a large unwanted margin that doesn't appear to come from the header.
 
 	// Set the style boxes for the TextEdit
 	theme->set_stylebox("normal", "TextEdit", style_box);
@@ -313,6 +332,8 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
 	style_box->set_draw_center(false);
+	style_box->set_border_width(SIDE_TOP, 1);
+	style_box->set_border_color(Color(0.8, 0.81, 0.82, 0.27)); // Set the border color (RGBA).
 	style_box->set_content_margin_individual(15, 10, 15, 10);
 	theme->set_stylebox("normal", "RichTextLabel", style_box);
 

From 99b3cede1c5161e23724db0760577a860069a658 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 12 Aug 2023 20:02:38 -0400
Subject: [PATCH 34/56] Misc minor improvements.

---
 editor/symbol_tooltip.cpp | 16 ++++++++--------
 editor/symbol_tooltip.h   |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 192c47e4432a..31a4b2056120 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -38,6 +38,7 @@
 SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 		code_editor(code_editor) {
 	// Initialize the tooltip components.
+	text_editor = code_editor->get_text_editor();
 
 	Ref<GDScriptSyntaxHighlighter> highlighter;
 	highlighter.instantiate();
@@ -108,8 +109,7 @@ void SymbolTooltip::_on_tooltip_delay_timeout() {
 }
 
 void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script) {
-	CodeEdit *text_editor = code_editor->get_text_editor();
-	String symbol_word = _get_symbol_word(text_editor, mouse_position);
+	String symbol_word = _get_symbol_word(mouse_position);
 	if (symbol_word.is_empty()) {
 		tooltip_delay->stop();
 		last_symbol_word = "";
@@ -117,7 +117,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		return;
 	}
 
-	if (symbol_word == last_symbol_word && is_visible()) {
+	if (symbol_word == last_symbol_word && is_visible()) { // Symbol has not changed.
 		return;
 	} else {
 		// Symbol has changed, reset the timer.
@@ -129,7 +129,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
 	const lsp::DocumentSymbol *member_symbol = get_member_symbol(members, symbol_word);
 
-	if (member_symbol == nullptr) {
+	if (member_symbol == nullptr) { // Symbol is not a member of the script.
 		tooltip_delay->stop();
 		hide();
 		return;
@@ -149,7 +149,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
 	if (!mouse_over_tooltip) {
 		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, mouse_position);
-		if (tooltip_position == Vector2(-1, -1)) { // If invalid position
+		if (tooltip_position == Vector2(-1, -1)) { // If position is invalid.
 			tooltip_delay->stop();
 			hide();
 			return;
@@ -164,13 +164,12 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	tooltip_delay->start();
 }
 
-String SymbolTooltip::_get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position) {
+String SymbolTooltip::_get_symbol_word(const Vector2 &mouse_position) {
 	// Get the word under the mouse cursor.
 	return text_editor->get_word_at_pos(mouse_position);
 }
 
 Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position) {
-	CodeEdit *text_editor = code_editor->get_text_editor();
 	Vector2 line_col = text_editor->get_line_column_at_pos(mouse_position);
 	int row = line_col.y;
 	int col = line_col.x;
@@ -219,7 +218,8 @@ void SymbolTooltip::_update_tooltip_size() {
 		v_padding += 1;
 	}
 
-	real_t tooltip_width = MAX(MIN(max_width, header_content_size.width + h_padding), body_label->is_visible() ? body_size.width : 0 );
+	real_t header_width = header_content_size.width + h_padding;
+	real_t tooltip_width = MAX(MIN(max_width, header_width), MIN(body_label->is_visible() ? body_size.width : 0, header_width) );
 	real_t tooltip_height = height + v_padding;
 	set_size(Vector2(tooltip_width, tooltip_height));
 }
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index f6782debc33e..cb30eecda7ed 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -43,6 +43,7 @@ class SymbolTooltip : public PopupPanel {
 
 	Ref<Script> script = nullptr;
 	CodeTextEditor *code_editor = nullptr;
+	CodeEdit *text_editor = nullptr;
 	PanelContainer *panel_container = nullptr;
 	VBoxContainer *layout_container = nullptr;
 	TextEdit *header_label = nullptr;
@@ -62,7 +63,7 @@ class SymbolTooltip : public PopupPanel {
 public:
 	void _on_tooltip_delay_timeout();
 	void update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script);
-	String _get_symbol_word(CodeEdit *text_editor, const Vector2 &mouse_position);
+	String _get_symbol_word(const Vector2 &mouse_position);
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
 	void _update_tooltip_size();
 	void _update_tooltip_content(const String &header_content, const String &body_content);

From 6a36bdc56630e8444fc03eb99fc7a3ee8004a7a5 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Thu, 7 Sep 2023 18:01:32 -0400
Subject: [PATCH 35/56] Transitioned from PopupPanel to PanelContainer. 
 Updated sizing calculations to account for this, fit to content, and have
 min/max sizes.

---
 editor/symbol_tooltip.cpp | 286 ++++++++++++++++++++++++++++++++------
 editor/symbol_tooltip.h   |   5 +-
 2 files changed, 247 insertions(+), 44 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 31a4b2056120..c0e3a64899ca 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -46,34 +46,36 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	// Set the tooltip's theme (PanelContainer's theme)
 	//set_theme(EditorNode::get_singleton()->get_gui_base()->get_theme());
 
-	//set_min_size(Vector2(100, 50));
-	set_transient(true);
-	set_flag(Window::FLAG_NO_FOCUS, true);
-	set_flag(Window::FLAG_POPUP, false);
-	set_flag(Window::FLAG_MOUSE_PASSTHROUGH, false);
-	set_theme(_create_popup_panel_theme());
-
-	// Create PanelContainer for styling the tooltip.
-	panel_container = memnew(PanelContainer);
-	panel_container->set_theme(_create_panel_theme());
-	add_child(panel_container);
+	set_as_top_level(true); // Prevents the tooltip from affecting the editor's layout.
+	hide();
+	/*set_v_size_flags(0);
+	set_h_size_flags(0);*/
+	set_z_index(1000);
+	set_theme(_create_panel_theme());
+	set_v_size_flags(Control::SIZE_SHRINK_BEGIN);
+	//set_clip_contents(true);
 
 	// Create VBoxContainer to hold the tooltip's header and body.
 	layout_container = memnew(VBoxContainer);
-	panel_container->add_child(layout_container);
+	layout_container->add_theme_constant_override("separation", 0);
+	layout_container->set_v_size_flags(Control::SIZE_SHRINK_BEGIN);
+	add_child(layout_container);
 
 	// Create RichTextLabel for the tooltip's header.
 	header_label = memnew(TextEdit);
-	//header_label->set_editable(false); // WARNING!! - Enabling this will mess with the theme.
 	header_label->set_focus_mode(Control::FOCUS_ALL);
 	header_label->set_context_menu_enabled(false);
 	header_label->set_h_scroll_visibility(false);
 	header_label->set_v_scroll_visibility(false);
 	header_label->set_syntax_highlighter(highlighter);
-	//header_label->set_selection_enabled(true);
 	header_label->set_custom_minimum_size(Size2(50, 45));
-	//header_label->set_line_wrapping_mode(TextEdit::LINE_WRAPPING_BOUNDARY);
-	//header_label->set_fit_content_height_enabled(true);
+
+	header_label->set_v_size_flags(Control::SIZE_SHRINK_BEGIN);
+	header_label->set_line_wrapping_mode(TextEdit::LINE_WRAPPING_BOUNDARY);
+	header_label->set_fit_content_height_enabled(true);
+
+	//header_label->set_editable(false); // WARNING!! - Enabling this will mess with the theme.
+	//header_label->set_selection_enabled(true);
 	header_label->set_theme(_create_header_label_theme());
 	layout_container->add_child(header_label);
 
@@ -81,10 +83,11 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	body_label = memnew(RichTextLabel);
 	body_label->set_use_bbcode(true);
 	body_label->set_selection_enabled(true);
-	body_label->set_custom_minimum_size(Size2(400, 100));
+	body_label->set_custom_minimum_size(Size2(400, 45));
 	body_label->set_focus_mode(Control::FOCUS_ALL);
-	body_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	//body_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	body_label->set_theme(_create_body_label_theme());
+	//body_label->set_fit_content(true); // WARNING!! - Enabling this will cause issues in _update_tooltip_size().
 	body_label->hide();
 	layout_container->add_child(body_label);
 
@@ -105,15 +108,30 @@ SymbolTooltip::~SymbolTooltip() {
 }
 
 void SymbolTooltip::_on_tooltip_delay_timeout() {
+	print_line("size: " + get_size() + ", vbox_size: " + layout_container->get_size() + ", header_size: " + header_label->get_size() + ", body_size: " + body_label->get_size());
+
 	show();
 }
 
+void SymbolTooltip::close_tooltip() {
+	tooltip_delay->stop();
+	hide();
+}
+
 void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script) {
+	//Rect2 tooltip_rect_1 = Rect2(get_position(), get_size());
+	//bool is_mouse_over_tooltip = tooltip_rect_1.has_point(mouse_position);
+	//print_line("local_mouse_position: " + get_local_mouse_position() + ", mouse_position: " + mouse_position + ", is_mouse_over_tooltip: " + String::num(is_mouse_over_tooltip));
+	//print_line("mouse_position: " + mouse_position);
+	/*if (mouse_position == Vector2(-1, -1)) { // If position is invalid.
+		close_tooltip();
+		return;
+	}*/
+
 	String symbol_word = _get_symbol_word(mouse_position);
 	if (symbol_word.is_empty()) {
-		tooltip_delay->stop();
 		last_symbol_word = "";
-		hide();
+		close_tooltip();
 		return;
 	}
 
@@ -121,7 +139,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		return;
 	} else {
 		// Symbol has changed, reset the timer.
-		tooltip_delay->stop();
+		close_tooltip();
 		last_symbol_word = symbol_word;
 	}
 
@@ -130,8 +148,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	const lsp::DocumentSymbol *member_symbol = get_member_symbol(members, symbol_word);
 
 	if (member_symbol == nullptr) { // Symbol is not a member of the script.
-		tooltip_delay->stop();
-		hide();
+		close_tooltip();
 		return;
 	}
 
@@ -150,18 +167,17 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	if (!mouse_over_tooltip) {
 		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, mouse_position);
 		if (tooltip_position == Vector2(-1, -1)) { // If position is invalid.
-			tooltip_delay->stop();
-			hide();
+			close_tooltip();
 			return;
 		} else {
-			//Vector2 symbol_position = tooltip_position - text_editor->get_screen_position();
-			//Vector2 temp_line_col = text_editor->get_line_column_at_pos(symbol_position);
 			set_position(tooltip_position);
 		}
 	}
 
 	// Start the timer to show the tooltip after a delay.
-	tooltip_delay->start();
+	if (!is_visible()) {
+		tooltip_delay->start();
+	}
 }
 
 String SymbolTooltip::_get_symbol_word(const Vector2 &mouse_position) {
@@ -179,13 +195,181 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 		int symbol_col = _get_word_pos_under_mouse(symbol_word, line, col);
 		if (symbol_col >= 0) {
 			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-			return text_editor->get_screen_position() + symbol_position;
+			return text_editor->get_global_position() + symbol_position;
 		}
 	}
 	return Vector2(-1, -1); // Indicates an invalid position.
 }
 
+/*void SymbolTooltip::_update_tooltip_size() {
+	// Calculate and set the tooltip's size.
+	//queue_redraw();
+
+	// Constants and References
+	const int MAX_WIDTH = 800;
+	const int MAX_HEIGHT = 450;
+
+	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
+	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	Size2 header_content_size = font->get_string_size(header_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+
+	//Size2 header_size = header_label->get_size();
+	//Size2 body_size = body_label->is_visible() ? body_label->get_size() : Size2(0, 0);
+
+	real_t lines_after_wrapping = header_content_size.width / MIN(MAX_WIDTH, header_content_size.width + 30);
+	real_t line_height = font->get_height(font_size);
+	real_t wrapped_height = line_height * lines_after_wrapping;
+	real_t calculated_header_height = wrapped_height + 20;
+	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height) + ", calculated_header_height: " + String::num(calculated_header_height));
+
+	Size2 body_content_size = font->get_string_size(body_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+	real_t lines_after_wrapping = header_content_size.width / MIN(MAX_WIDTH, header_content_size.width + 30);
+	real_t line_height = font->get_height(font_size);
+	real_t wrapped_height = line_height * lines_after_wrapping;
+	real_t calculated_header_height = wrapped_height + 20;
+
+	Size2 content_size = Size2(MAX(header_content_size.width, body_size.width) + 32, header_size.height + body_size.height);
+	Size2 panel_size = Size2(MIN(MAX_WIDTH, content_size.width), MIN(MAX_HEIGHT, content_size.height));
+	print_line("font_size: " + String::num(font_size) + ", header_content_size: " + header_content_size + ", header_size: " + header_size + ", body_size: " + body_size + ", content_size: " + content_size + ", panel_size: " + panel_size);
+	// real_t tooltip_width = MAX(MIN(MAX_WIDTH, header_width), MIN(body_label->is_visible() ? body_width : 0, header_width));
+
+	set_size(panel_size);
+}
+
+void SymbolTooltip::compute_height_based_on_content(String content, real_t vertical_padding, real_t max_width) {
+	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
+	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	Size2 content_size = font->get_string_size(content, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+	real_t line_height = font->get_height(font_size);
+	real_t lines_after_wrapping = content_size.width / MIN(max_width, content_size.width + 30);
+	real_t wrapped_height = line_height * lines_after_wrapping;
+	real_t calculated_height = wrapped_height + vertical_padding;
+	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height) + ", calculated_height: " + String::num(calculated_height));
+}*/
+
+/*void SymbolTooltip::_update_tooltip_size() {
+	// Calculate and set the tooltip's size.
+	//queue_redraw();
+
+	// Constants and References
+	const int MAX_WIDTH = 800;
+	const int MAX_HEIGHT = 450;
+
+	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
+	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	Size2 header_content_size = font->get_string_size(header_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+
+	Size2 header_size = header_label->get_size();
+	Size2 body_size = body_label->is_visible() ? body_label->get_size() : Size2(0, 0);
+	Size2 content_size = Size2(MAX(header_content_size.width, body_size.width) + 32, header_size.height + body_size.height);
+	Size2 panel_size = Size2(MIN(MAX_WIDTH, content_size.width), MIN(MAX_HEIGHT, content_size.height));
+	print_line("font_size: " + String::num(font_size) + ", header_content_size: " + header_content_size + ", header_size: " + header_size + ", body_size: " + body_size + ", content_size: " + content_size + ", panel_size: " + panel_size);
+	// real_t tooltip_width = MAX(MIN(MAX_WIDTH, header_width), MIN(body_label->is_visible() ? body_width : 0, header_width));
+
+	header_label->set_size(Size2(panel_size.width, MIN(150, header_size.height)));
+	body_label->set_size(Size2(panel_size.width, MIN(300, body_size.height)));
+	set_size(panel_size);
+}*/
+
 void SymbolTooltip::_update_tooltip_size() {
+	// Constants and References
+	const int MAX_WIDTH = 800;
+	Ref<Theme> header_theme = header_label->get_theme();
+	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
+	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
+	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	String header_text = header_label->get_text();
+	Ref<Theme> body_theme = body_label->get_theme();
+	Ref<StyleBox> body_style_box = body_theme->get_stylebox("normal", "RichTextLabel");
+
+	// Calculate content size and style box paddings
+	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+	real_t header_h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT);
+	//real_t header_v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM);
+	real_t body_h_padding = body_style_box->get_content_margin(SIDE_LEFT) + body_style_box->get_content_margin(SIDE_RIGHT);
+	real_t body_v_padding = body_style_box->get_content_margin(SIDE_TOP) + body_style_box->get_content_margin(SIDE_BOTTOM);
+
+	// Determine tooltip width based on max width, header width, and body visibility
+	real_t header_width = header_content_size.width + header_h_padding;
+	real_t body_width = body_label->get_content_width() + body_h_padding;
+	real_t tooltip_width = MIN(MAX_WIDTH, MAX(header_width, body_label->is_visible() ? body_width : 0) + 10); // TODO: Should be +2, but +10 is needed and I'm not sure why.
+
+	// Set sizes
+	header_label->set_custom_minimum_size(Size2(tooltip_width, -1)); // TODO: Calculate this accurately instead of using -1.
+	body_label->set_custom_minimum_size(Size2(tooltip_width, MIN(body_label->get_content_height() + body_v_padding, 400)));
+	set_size(Vector2(tooltip_width, -1));
+}
+
+// BEST SO FAR. Issue is that body doesn't have max height.
+/*void SymbolTooltip::_update_tooltip_size() {
+	// Constants and References
+	const int MAX_WIDTH = 800;
+	Ref<Theme> header_theme = header_label->get_theme();
+	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
+	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
+	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	String header_text = header_label->get_text();
+	Ref<Theme> body_theme = body_label->get_theme();
+	Ref<StyleBox> body_style_box = body_theme->get_stylebox("normal", "RichTextLabel");
+
+	// Calculate content size and style box paddings
+	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+	real_t header_h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT);
+	real_t header_v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM);
+	real_t body_h_padding = body_style_box->get_content_margin(SIDE_LEFT) + body_style_box->get_content_margin(SIDE_RIGHT);
+	real_t body_v_padding = body_style_box->get_content_margin(SIDE_TOP) + body_style_box->get_content_margin(SIDE_BOTTOM);
+
+	// Determine tooltip width based on max width, header width, and body visibility
+	Vector2 body_size = body_label->get_size();
+	real_t header_width = header_content_size.width + header_h_padding;
+	print_line("body_content_width: " + String::num(body_label->get_content_width()) + ", is_visible: " + String::num(body_label->is_visible()));
+	real_t body_width = body_label->get_content_width() + body_h_padding;
+
+	real_t tooltip_width = MIN(MAX_WIDTH, MAX(header_width, body_label->is_visible() ? body_width : 0));
+	//real_t tooltip_width = MAX(MIN(MAX_WIDTH, header_width), MIN(body_label->is_visible() ? body_width : 0, header_width));
+
+	header_label->set_custom_minimum_size(Size2(tooltip_width, -1));
+
+	// Check if line wrapping is required and apply if necessary
+	bool need_to_wrap = header_content_size.width > tooltip_width;
+	TextEdit::LineWrappingMode line_wrapping_mode = need_to_wrap ? TextEdit::LINE_WRAPPING_BOUNDARY : TextEdit::LINE_WRAPPING_NONE;
+	if (header_label->get_line_wrapping_mode() != line_wrapping_mode) {
+		header_label->set_line_wrapping_mode(line_wrapping_mode);
+		header_label->set_fit_content_height_enabled(true);
+	}
+
+	print_line("header_label->get_line_wrap_count(0): " + String::num(header_label->get_line_wrap_count(0)) + ", header_label->get_last_full_visible_line_wrap_index(): " + String::num(header_label->get_last_full_visible_line_wrap_index()));
+	print_line("header_content_size: " + header_content_size + ", tooltip_width: " + String::num(tooltip_width) + ", need_to_wrap: " + String::num(need_to_wrap));
+
+	// Calculate header height based on wrapping
+	//real_t lines_after_wrapping = round(header_content_size.width / (tooltip_width - header_h_padding)); // Must account for margins.
+	real_t lines_after_wrapping = header_label->get_line_wrap_count(0);
+	real_t line_height = header_label->get_line_height();
+	real_t wrapped_height = line_height * lines_after_wrapping;
+	real_t header_height = need_to_wrap ? wrapped_height : header_content_size.height;
+	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height) + ", header_height: " + String::num(header_height));
+
+	// Update total height for tooltip if body label is visible
+	real_t height = header_height;
+	if (body_label->is_visible()) {
+		height += body_size.height;
+		//v_padding += 1;
+	}
+	real_t tooltip_height = height + header_v_padding;
+
+	// Set sizes
+	//Size2 new_header_size = Size2(tooltip_width, MAX(header_height + header_v_padding, 45));
+	//header_label->set_custom_minimum_size(new_header_size);
+	//header_label->set_size(new_header_size);
+	//body_label->set_size(Vector2(tooltip_width, body_size.height));
+	Size2 new_body_size = Size2(tooltip_width, body_label->get_content_height() + body_v_padding);
+	body_label->set_custom_minimum_size(new_body_size);
+	//layout_container->set_size(Vector2(tooltip_width, tooltip_height));
+ 	//update_minimum_size();
+	set_size(Vector2(tooltip_width, -1));
+}*/
+
+/*void SymbolTooltip::_update_tooltip_size() {
 	// Calculate and set the tooltip's size.
 	int max_width = 800;
 	Ref<Theme> header_theme = header_label->get_theme();
@@ -196,33 +380,54 @@ void SymbolTooltip::_update_tooltip_size() {
 	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
 	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
 
-	bool need_to_wrap = header_content_size.width > max_width;
+	real_t h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT) + 2;
+	real_t v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM) + 2;
+
+	Vector2 body_size = body_label->get_size();
+	real_t header_width = header_content_size.width + h_padding;
+	real_t tooltip_width = MAX(MIN(max_width, header_width), MIN(body_label->is_visible() ? body_size.width : 0, header_width) );
+
+	print_line("header_label_before: " + header_label->get_size() + ", header_content_size: " + header_content_size);
+	bool need_to_wrap = header_content_size.width > tooltip_width;
 	TextEdit::LineWrappingMode line_wrapping_mode = need_to_wrap ? TextEdit::LINE_WRAPPING_BOUNDARY : TextEdit::LINE_WRAPPING_NONE;
 	if (header_label->get_line_wrapping_mode() != line_wrapping_mode) {
 		header_label->set_line_wrapping_mode(line_wrapping_mode);
-		header_label->set_fit_content_height_enabled(need_to_wrap); // TODO: Fix issue where the tooltip height renders incorrectly when this is enabled and line wrapping is occurring.
+		//header_label->set_fit_content_height_enabled(need_to_wrap); // TODO: Fix issue where the tooltip height renders incorrectly when this is enabled and line wrapping is occurring.
+		header_label->set_fit_content_height_enabled(false);
 	}
+	print_line("header_label_after: " + header_label->get_size());
 
-	real_t lines_after_wrapping = header_content_size.width / max_width;
+	real_t lines_after_wrapping = header_content_size.width / tooltip_width;
 	real_t line_height = font->get_height(font_size);
 	real_t wrapped_height = line_height * lines_after_wrapping;
+	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height));
 
-	real_t h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT) + 2;
-	real_t v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM) + 2;
 	real_t header_height = need_to_wrap ? wrapped_height : header_content_size.height;
 	real_t height = header_height;
 
-	Vector2 body_size = body_label->get_size();
 	if (body_label->is_visible()) {
 		height += body_size.height;
 		v_padding += 1;
 	}
 
-	real_t header_width = header_content_size.width + h_padding;
-	real_t tooltip_width = MAX(MIN(max_width, header_width), MIN(body_label->is_visible() ? body_size.width : 0, header_width) );
 	real_t tooltip_height = height + v_padding;
-	set_size(Vector2(tooltip_width, tooltip_height));
-}
+	print_line("header_width: " + String::num(header_width) + ", header_height: " + String::num(header_height) + ", body_width: " + String::num(body_size.width) + ", body_height: " + String::num(body_size.height) + ", header_content_size: " + header_content_size + ", tooltip_width: " + String::num(tooltip_width) + ", tooltip_height: " + String::num(tooltip_height));
+
+	Size2 new_header_size = Size2(tooltip_width, MAX(header_height + v_padding, 45));
+	header_label->set_custom_minimum_size(new_header_size);
+	header_label->set_size(new_header_size);
+	layout_container->set_size(Vector2(tooltip_width, tooltip_height));
+	TypedArray<Node> children = layout_container->get_children();
+	print_line("num_children: " + String::num(children.size()));
+	for (int i = 0; i < children.size(); i++) {
+		Node *child = Object::cast_to<Node>(children[i]);
+		print_line("child: " + child->get_name());
+	}
+	print_line("Header Label Minimum Size: " + header_label->get_combined_minimum_size());
+	//header_label->set_size(Vector2(header_width, header_height));
+	//set_size(Vector2(tooltip_width, tooltip_height));
+	//layout_container->queue_redraw();
+}*/
 
 void SymbolTooltip::_update_tooltip_content(const String &header_content, const String &body_content) {
 	// Update the tooltip's header and body.
@@ -232,7 +437,6 @@ void SymbolTooltip::_update_tooltip_content(const String &header_content, const
 
 void SymbolTooltip::_update_header_label(const String &header_content) {
 	// Set the tooltip's header text.
-	//Ref<SyntaxHighlighter> highlighter = code_editor->get_text_editor()->get_syntax_highlighter();
 	header_label->set_text(header_content);
 }
 
@@ -313,8 +517,6 @@ Ref<Theme> SymbolTooltip::_create_header_label_theme() {
 	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
 	style_box->set_draw_center(false);
 	style_box->set_content_margin_individual(15, 10, 15, 10);
-	// TODO: The horizontal scrollbar may still be taking up space even when invisible??  Something is adding unwanted bottom margin.
-	// TODO: Besides the small bottom unwanted margin, there is still a large unwanted margin that doesn't appear to come from the header.
 
 	// Set the style boxes for the TextEdit
 	theme->set_stylebox("normal", "TextEdit", style_box);
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index cb30eecda7ed..09c9751d0c44 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -38,8 +38,8 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/rich_text_label.h"
 
-class SymbolTooltip : public PopupPanel {
-	GDCLASS(SymbolTooltip, PopupPanel);
+class SymbolTooltip : public PanelContainer {
+	GDCLASS(SymbolTooltip, PanelContainer);
 
 	Ref<Script> script = nullptr;
 	CodeTextEditor *code_editor = nullptr;
@@ -62,6 +62,7 @@ class SymbolTooltip : public PopupPanel {
 
 public:
 	void _on_tooltip_delay_timeout();
+	void close_tooltip();
 	void update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script);
 	String _get_symbol_word(const Vector2 &mouse_position);
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);

From 0cd17f4799fa7768a89d7f2dc1e2a8cbb3b52334 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Thu, 7 Sep 2023 22:10:45 -0400
Subject: [PATCH 36/56] A mouse exiting a tooltip now causes it to hide().

---
 editor/symbol_tooltip.cpp | 54 +++++++++++++++++++++++++++------------
 editor/symbol_tooltip.h   | 12 ++++++---
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index c0e3a64899ca..4dd6aeb38280 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -53,6 +53,9 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 	set_z_index(1000);
 	set_theme(_create_panel_theme());
 	set_v_size_flags(Control::SIZE_SHRINK_BEGIN);
+	//set_size(Size2(400, 400));
+	//set_position(Size2(800, 800));
+	set_process(true);
 	//set_clip_contents(true);
 
 	// Create VBoxContainer to hold the tooltip's header and body.
@@ -99,6 +102,8 @@ SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
 
 	tooltip_delay->connect("timeout", callable_mp(this, &SymbolTooltip::_on_tooltip_delay_timeout));
 
+	mouse_inside = false;
+
 	// Connect the tooltip's update function to the mouse motion signal.
 	// connect("mouse_motion", callable_mp(this, &SymbolTooltip::_update_symbol_tooltip));
 }
@@ -107,31 +112,49 @@ SymbolTooltip::~SymbolTooltip() {
 	memdelete(tooltip_delay);
 }
 
+void SymbolTooltip::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_PROCESS: {
+			// Note: Child components prevent NOTIFICATION_MOUSE_ENTER and NOTIFICATION_MOUSE_EXIT from working properly.
+			// Get the local mouse position
+			Vector2 local_mouse_position = get_global_mouse_position() - get_global_position();
+
+			// Check if it's within the rect of the PanelContainer
+			Rect2 tooltip_rect = Rect2(Vector2(0, 0), get_size());
+			if (tooltip_rect.has_point(local_mouse_position)) {
+				if (is_visible() && !mouse_inside) {
+					// Mouse just entered
+					mouse_inside = true;
+				}
+			} else {
+				if (mouse_inside) {
+					// Mouse just exited
+					mouse_inside = false;
+					if (is_visible()) {
+						_close_tooltip();
+					}
+				}
+			}
+		} break;
+	}
+}
+
 void SymbolTooltip::_on_tooltip_delay_timeout() {
 	print_line("size: " + get_size() + ", vbox_size: " + layout_container->get_size() + ", header_size: " + header_label->get_size() + ", body_size: " + body_label->get_size());
 
 	show();
 }
 
-void SymbolTooltip::close_tooltip() {
+void SymbolTooltip::_close_tooltip() {
 	tooltip_delay->stop();
 	hide();
 }
 
 void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script) {
-	//Rect2 tooltip_rect_1 = Rect2(get_position(), get_size());
-	//bool is_mouse_over_tooltip = tooltip_rect_1.has_point(mouse_position);
-	//print_line("local_mouse_position: " + get_local_mouse_position() + ", mouse_position: " + mouse_position + ", is_mouse_over_tooltip: " + String::num(is_mouse_over_tooltip));
-	//print_line("mouse_position: " + mouse_position);
-	/*if (mouse_position == Vector2(-1, -1)) { // If position is invalid.
-		close_tooltip();
-		return;
-	}*/
-
 	String symbol_word = _get_symbol_word(mouse_position);
 	if (symbol_word.is_empty()) {
 		last_symbol_word = "";
-		close_tooltip();
+		_close_tooltip();
 		return;
 	}
 
@@ -139,7 +162,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		return;
 	} else {
 		// Symbol has changed, reset the timer.
-		close_tooltip();
+		_close_tooltip();
 		last_symbol_word = symbol_word;
 	}
 
@@ -148,7 +171,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	const lsp::DocumentSymbol *member_symbol = get_member_symbol(members, symbol_word);
 
 	if (member_symbol == nullptr) { // Symbol is not a member of the script.
-		close_tooltip();
+		_close_tooltip();
 		return;
 	}
 
@@ -162,12 +185,11 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 	_update_tooltip_content(header_content, body_content);
 	_update_tooltip_size();
 
-	Rect2 tooltip_rect = Rect2(get_position(), get_size());
-	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position);
+	bool mouse_over_tooltip = get_rect().has_point(mouse_position);
 	if (!mouse_over_tooltip) {
 		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, mouse_position);
 		if (tooltip_position == Vector2(-1, -1)) { // If position is invalid.
-			close_tooltip();
+			_close_tooltip();
 			return;
 		} else {
 			set_position(tooltip_position);
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 09c9751d0c44..1efe0d6361e7 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -50,6 +50,7 @@ class SymbolTooltip : public PanelContainer {
 	RichTextLabel *body_label = nullptr;
 	Timer *tooltip_delay = nullptr;
 	String last_symbol_word;
+	bool mouse_inside;
 
 	String _get_doc_of_word(const String &symbol_word);
 	void _update_header_label(const String &symbol_word);
@@ -59,15 +60,18 @@ class SymbolTooltip : public PanelContainer {
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();
 	int _get_word_pos_under_mouse(const String &symbol_word, const String &p_search, int mouse_x) const;
-
-public:
 	void _on_tooltip_delay_timeout();
-	void close_tooltip();
-	void update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script);
+	void _close_tooltip();
 	String _get_symbol_word(const Vector2 &mouse_position);
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
 	void _update_tooltip_size();
 	void _update_tooltip_content(const String &header_content, const String &body_content);
+
+protected:
+	void _notification(int p_what);
+
+public:
+	void update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script);
 	SymbolTooltip(CodeTextEditor *code_editor);
 	~SymbolTooltip();
 };

From ea6bc7d7ee478e00bd9ebdb5dc0aa66b03126f67 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Thu, 7 Sep 2023 22:12:35 -0400
Subject: [PATCH 37/56] Removed unneeded code.

---
 editor/symbol_tooltip.cpp | 209 --------------------------------------
 editor/symbol_tooltip.h   |   1 -
 2 files changed, 210 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 4dd6aeb38280..6c06d41ae085 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -223,76 +223,6 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, co
 	return Vector2(-1, -1); // Indicates an invalid position.
 }
 
-/*void SymbolTooltip::_update_tooltip_size() {
-	// Calculate and set the tooltip's size.
-	//queue_redraw();
-
-	// Constants and References
-	const int MAX_WIDTH = 800;
-	const int MAX_HEIGHT = 450;
-
-	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
-	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
-	Size2 header_content_size = font->get_string_size(header_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-
-	//Size2 header_size = header_label->get_size();
-	//Size2 body_size = body_label->is_visible() ? body_label->get_size() : Size2(0, 0);
-
-	real_t lines_after_wrapping = header_content_size.width / MIN(MAX_WIDTH, header_content_size.width + 30);
-	real_t line_height = font->get_height(font_size);
-	real_t wrapped_height = line_height * lines_after_wrapping;
-	real_t calculated_header_height = wrapped_height + 20;
-	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height) + ", calculated_header_height: " + String::num(calculated_header_height));
-
-	Size2 body_content_size = font->get_string_size(body_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-	real_t lines_after_wrapping = header_content_size.width / MIN(MAX_WIDTH, header_content_size.width + 30);
-	real_t line_height = font->get_height(font_size);
-	real_t wrapped_height = line_height * lines_after_wrapping;
-	real_t calculated_header_height = wrapped_height + 20;
-
-	Size2 content_size = Size2(MAX(header_content_size.width, body_size.width) + 32, header_size.height + body_size.height);
-	Size2 panel_size = Size2(MIN(MAX_WIDTH, content_size.width), MIN(MAX_HEIGHT, content_size.height));
-	print_line("font_size: " + String::num(font_size) + ", header_content_size: " + header_content_size + ", header_size: " + header_size + ", body_size: " + body_size + ", content_size: " + content_size + ", panel_size: " + panel_size);
-	// real_t tooltip_width = MAX(MIN(MAX_WIDTH, header_width), MIN(body_label->is_visible() ? body_width : 0, header_width));
-
-	set_size(panel_size);
-}
-
-void SymbolTooltip::compute_height_based_on_content(String content, real_t vertical_padding, real_t max_width) {
-	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
-	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
-	Size2 content_size = font->get_string_size(content, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-	real_t line_height = font->get_height(font_size);
-	real_t lines_after_wrapping = content_size.width / MIN(max_width, content_size.width + 30);
-	real_t wrapped_height = line_height * lines_after_wrapping;
-	real_t calculated_height = wrapped_height + vertical_padding;
-	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height) + ", calculated_height: " + String::num(calculated_height));
-}*/
-
-/*void SymbolTooltip::_update_tooltip_size() {
-	// Calculate and set the tooltip's size.
-	//queue_redraw();
-
-	// Constants and References
-	const int MAX_WIDTH = 800;
-	const int MAX_HEIGHT = 450;
-
-	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
-	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
-	Size2 header_content_size = font->get_string_size(header_label->get_text(), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-
-	Size2 header_size = header_label->get_size();
-	Size2 body_size = body_label->is_visible() ? body_label->get_size() : Size2(0, 0);
-	Size2 content_size = Size2(MAX(header_content_size.width, body_size.width) + 32, header_size.height + body_size.height);
-	Size2 panel_size = Size2(MIN(MAX_WIDTH, content_size.width), MIN(MAX_HEIGHT, content_size.height));
-	print_line("font_size: " + String::num(font_size) + ", header_content_size: " + header_content_size + ", header_size: " + header_size + ", body_size: " + body_size + ", content_size: " + content_size + ", panel_size: " + panel_size);
-	// real_t tooltip_width = MAX(MIN(MAX_WIDTH, header_width), MIN(body_label->is_visible() ? body_width : 0, header_width));
-
-	header_label->set_size(Size2(panel_size.width, MIN(150, header_size.height)));
-	body_label->set_size(Size2(panel_size.width, MIN(300, body_size.height)));
-	set_size(panel_size);
-}*/
-
 void SymbolTooltip::_update_tooltip_size() {
 	// Constants and References
 	const int MAX_WIDTH = 800;
@@ -322,135 +252,6 @@ void SymbolTooltip::_update_tooltip_size() {
 	set_size(Vector2(tooltip_width, -1));
 }
 
-// BEST SO FAR. Issue is that body doesn't have max height.
-/*void SymbolTooltip::_update_tooltip_size() {
-	// Constants and References
-	const int MAX_WIDTH = 800;
-	Ref<Theme> header_theme = header_label->get_theme();
-	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
-	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
-	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
-	String header_text = header_label->get_text();
-	Ref<Theme> body_theme = body_label->get_theme();
-	Ref<StyleBox> body_style_box = body_theme->get_stylebox("normal", "RichTextLabel");
-
-	// Calculate content size and style box paddings
-	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-	real_t header_h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT);
-	real_t header_v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM);
-	real_t body_h_padding = body_style_box->get_content_margin(SIDE_LEFT) + body_style_box->get_content_margin(SIDE_RIGHT);
-	real_t body_v_padding = body_style_box->get_content_margin(SIDE_TOP) + body_style_box->get_content_margin(SIDE_BOTTOM);
-
-	// Determine tooltip width based on max width, header width, and body visibility
-	Vector2 body_size = body_label->get_size();
-	real_t header_width = header_content_size.width + header_h_padding;
-	print_line("body_content_width: " + String::num(body_label->get_content_width()) + ", is_visible: " + String::num(body_label->is_visible()));
-	real_t body_width = body_label->get_content_width() + body_h_padding;
-
-	real_t tooltip_width = MIN(MAX_WIDTH, MAX(header_width, body_label->is_visible() ? body_width : 0));
-	//real_t tooltip_width = MAX(MIN(MAX_WIDTH, header_width), MIN(body_label->is_visible() ? body_width : 0, header_width));
-
-	header_label->set_custom_minimum_size(Size2(tooltip_width, -1));
-
-	// Check if line wrapping is required and apply if necessary
-	bool need_to_wrap = header_content_size.width > tooltip_width;
-	TextEdit::LineWrappingMode line_wrapping_mode = need_to_wrap ? TextEdit::LINE_WRAPPING_BOUNDARY : TextEdit::LINE_WRAPPING_NONE;
-	if (header_label->get_line_wrapping_mode() != line_wrapping_mode) {
-		header_label->set_line_wrapping_mode(line_wrapping_mode);
-		header_label->set_fit_content_height_enabled(true);
-	}
-
-	print_line("header_label->get_line_wrap_count(0): " + String::num(header_label->get_line_wrap_count(0)) + ", header_label->get_last_full_visible_line_wrap_index(): " + String::num(header_label->get_last_full_visible_line_wrap_index()));
-	print_line("header_content_size: " + header_content_size + ", tooltip_width: " + String::num(tooltip_width) + ", need_to_wrap: " + String::num(need_to_wrap));
-
-	// Calculate header height based on wrapping
-	//real_t lines_after_wrapping = round(header_content_size.width / (tooltip_width - header_h_padding)); // Must account for margins.
-	real_t lines_after_wrapping = header_label->get_line_wrap_count(0);
-	real_t line_height = header_label->get_line_height();
-	real_t wrapped_height = line_height * lines_after_wrapping;
-	real_t header_height = need_to_wrap ? wrapped_height : header_content_size.height;
-	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height) + ", header_height: " + String::num(header_height));
-
-	// Update total height for tooltip if body label is visible
-	real_t height = header_height;
-	if (body_label->is_visible()) {
-		height += body_size.height;
-		//v_padding += 1;
-	}
-	real_t tooltip_height = height + header_v_padding;
-
-	// Set sizes
-	//Size2 new_header_size = Size2(tooltip_width, MAX(header_height + header_v_padding, 45));
-	//header_label->set_custom_minimum_size(new_header_size);
-	//header_label->set_size(new_header_size);
-	//body_label->set_size(Vector2(tooltip_width, body_size.height));
-	Size2 new_body_size = Size2(tooltip_width, body_label->get_content_height() + body_v_padding);
-	body_label->set_custom_minimum_size(new_body_size);
-	//layout_container->set_size(Vector2(tooltip_width, tooltip_height));
- 	//update_minimum_size();
-	set_size(Vector2(tooltip_width, -1));
-}*/
-
-/*void SymbolTooltip::_update_tooltip_size() {
-	// Calculate and set the tooltip's size.
-	int max_width = 800;
-	Ref<Theme> header_theme = header_label->get_theme();
-	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
-	String header_text = header_label->get_text();
-
-	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
-	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
-	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
-
-	real_t h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT) + 2;
-	real_t v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM) + 2;
-
-	Vector2 body_size = body_label->get_size();
-	real_t header_width = header_content_size.width + h_padding;
-	real_t tooltip_width = MAX(MIN(max_width, header_width), MIN(body_label->is_visible() ? body_size.width : 0, header_width) );
-
-	print_line("header_label_before: " + header_label->get_size() + ", header_content_size: " + header_content_size);
-	bool need_to_wrap = header_content_size.width > tooltip_width;
-	TextEdit::LineWrappingMode line_wrapping_mode = need_to_wrap ? TextEdit::LINE_WRAPPING_BOUNDARY : TextEdit::LINE_WRAPPING_NONE;
-	if (header_label->get_line_wrapping_mode() != line_wrapping_mode) {
-		header_label->set_line_wrapping_mode(line_wrapping_mode);
-		//header_label->set_fit_content_height_enabled(need_to_wrap); // TODO: Fix issue where the tooltip height renders incorrectly when this is enabled and line wrapping is occurring.
-		header_label->set_fit_content_height_enabled(false);
-	}
-	print_line("header_label_after: " + header_label->get_size());
-
-	real_t lines_after_wrapping = header_content_size.width / tooltip_width;
-	real_t line_height = font->get_height(font_size);
-	real_t wrapped_height = line_height * lines_after_wrapping;
-	print_line("lines_after_wrapping: " + String::num(lines_after_wrapping) + ", line_height: " + String::num(line_height) + ", wrapped_height: " + String::num(wrapped_height));
-
-	real_t header_height = need_to_wrap ? wrapped_height : header_content_size.height;
-	real_t height = header_height;
-
-	if (body_label->is_visible()) {
-		height += body_size.height;
-		v_padding += 1;
-	}
-
-	real_t tooltip_height = height + v_padding;
-	print_line("header_width: " + String::num(header_width) + ", header_height: " + String::num(header_height) + ", body_width: " + String::num(body_size.width) + ", body_height: " + String::num(body_size.height) + ", header_content_size: " + header_content_size + ", tooltip_width: " + String::num(tooltip_width) + ", tooltip_height: " + String::num(tooltip_height));
-
-	Size2 new_header_size = Size2(tooltip_width, MAX(header_height + v_padding, 45));
-	header_label->set_custom_minimum_size(new_header_size);
-	header_label->set_size(new_header_size);
-	layout_container->set_size(Vector2(tooltip_width, tooltip_height));
-	TypedArray<Node> children = layout_container->get_children();
-	print_line("num_children: " + String::num(children.size()));
-	for (int i = 0; i < children.size(); i++) {
-		Node *child = Object::cast_to<Node>(children[i]);
-		print_line("child: " + child->get_name());
-	}
-	print_line("Header Label Minimum Size: " + header_label->get_combined_minimum_size());
-	//header_label->set_size(Vector2(header_width, header_height));
-	//set_size(Vector2(tooltip_width, tooltip_height));
-	//layout_container->queue_redraw();
-}*/
-
 void SymbolTooltip::_update_tooltip_content(const String &header_content, const String &body_content) {
 	// Update the tooltip's header and body.
 	_update_header_label(header_content);
@@ -509,16 +310,6 @@ String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
 	return documentation;
 }
 
-Ref<Theme> SymbolTooltip::_create_popup_panel_theme() {
-	Ref<Theme> theme = memnew(Theme);
-
-	Ref<StyleBoxFlat> style_box = memnew(StyleBoxFlat);
-	style_box->set_draw_center(false);
-	theme->set_stylebox("panel", "PopupPanel", style_box);
-
-	return theme;
-}
-
 Ref<Theme> SymbolTooltip::_create_panel_theme() {
 	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode).
 
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 1efe0d6361e7..d22bc3d3a4a3 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -55,7 +55,6 @@ class SymbolTooltip : public PanelContainer {
 	String _get_doc_of_word(const String &symbol_word);
 	void _update_header_label(const String &symbol_word);
 	void _update_body_label(const String &documentation);
-	Ref<Theme> _create_popup_panel_theme();
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();

From b154a414248849a6a05562fc6b3cab7ecde2996a Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 9 Sep 2023 20:25:11 -0400
Subject: [PATCH 38/56] Cleaned up issues caught by GitHub Actions.

---
 editor/symbol_tooltip.cpp | 14 +++++++-------
 editor/symbol_tooltip.h   | 13 +++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 6c06d41ae085..97acb977bef5 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -150,7 +150,7 @@ void SymbolTooltip::_close_tooltip() {
 	hide();
 }
 
-void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script) {
+void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &script) {
 	String symbol_word = _get_symbol_word(mouse_position);
 	if (symbol_word.is_empty()) {
 		last_symbol_word = "";
@@ -166,9 +166,9 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, Ref<Scr
 		last_symbol_word = symbol_word;
 	}
 
-	ExtendGDScriptParser *parser = get_script_parser(script);
+	ExtendGDScriptParser *parser = _get_script_parser(script);
 	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
-	const lsp::DocumentSymbol *member_symbol = get_member_symbol(members, symbol_word);
+	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, symbol_word);
 
 	if (member_symbol == nullptr) { // Symbol is not a member of the script.
 		_close_tooltip();
@@ -385,7 +385,7 @@ int SymbolTooltip::_get_word_pos_under_mouse(const String &symbol_word, const St
 }
 
 // Copied from script_text_editor.cpp
-static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
+/*static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
 	if (p_current->get_owner() != p_base && p_base != p_current) {
 		return nullptr;
 	}
@@ -401,7 +401,7 @@ static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Scri
 	}
 
 	return nullptr;
-}
+}*/
 
 const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &symbol_word) {
 	for (int i = 0; i < node->members.size(); ++i) {
@@ -437,7 +437,7 @@ const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::Class
 	return ast_tree;
 }*/
 
-static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script) {
+ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_script) {
 	// Create and initialize the parser.
 	ExtendGDScriptParser *parser = memnew(ExtendGDScriptParser);
 	Error err = parser->parse(p_script->get_source_code(), p_script->get_path());
@@ -451,7 +451,7 @@ static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script) {
 }
 
 // TODO: Need to find the correct symbol instance instead of just the first match.
-const lsp::DocumentSymbol *get_member_symbol(
+const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		HashMap<String, const lsp::DocumentSymbol *> &members,
 		const String &symbol_word) {//,
 		//const Vector2 &symbol_position) {
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index d22bc3d3a4a3..ed0be831bb99 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -41,7 +41,6 @@
 class SymbolTooltip : public PanelContainer {
 	GDCLASS(SymbolTooltip, PanelContainer);
 
-	Ref<Script> script = nullptr;
 	CodeTextEditor *code_editor = nullptr;
 	CodeEdit *text_editor = nullptr;
 	PanelContainer *panel_container = nullptr;
@@ -65,19 +64,21 @@ class SymbolTooltip : public PanelContainer {
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
 	void _update_tooltip_size();
 	void _update_tooltip_content(const String &header_content, const String &body_content);
+	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
+	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
 
 protected:
 	void _notification(int p_what);
 
 public:
-	void update_symbol_tooltip(const Vector2 &mouse_position, Ref<Script> script);
+	void update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &script);
 	SymbolTooltip(CodeTextEditor *code_editor);
 	~SymbolTooltip();
 };
 
-static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
-static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script);
-static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script);
-const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
+// static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
+// static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script);
+// static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script);
+// const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
 
 #endif // SYMBOL_TOOLTIP_H

From 82ab33833644780b2e7ab4453a3771f3f1b4210c Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 9 Sep 2023 21:07:23 -0400
Subject: [PATCH 39/56] Formatting fixes.

---
 editor/symbol_tooltip.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 97acb977bef5..40fa0f8a44bc 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -453,10 +453,9 @@ ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_scr
 // TODO: Need to find the correct symbol instance instead of just the first match.
 const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		HashMap<String, const lsp::DocumentSymbol *> &members,
-		const String &symbol_word) {//,
-		//const Vector2 &symbol_position) {
+		const String &symbol_word) { // , const Vector2 &symbol_position) {
 	// Use a queue to implement breadth-first search.
-	std::queue<const lsp::DocumentSymbol*> queue;
+	std::queue<const lsp::DocumentSymbol *> queue;
 
 	// Add all members to the queue.
 	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : members) {
@@ -480,5 +479,5 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		}
 	}
 
-	return nullptr;  // If the symbol is not found, return nullptr.
+	return nullptr; // If the symbol is not found, return nullptr.
 }

From 4a2d88b86aa93aca45984a20039b8a899f02513c Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 04:02:42 -0400
Subject: [PATCH 40/56] Fixed shadow variables.

---
 editor/plugins/script_text_editor.cpp |  2 +-
 editor/symbol_tooltip.cpp             | 11 ++++-------
 editor/symbol_tooltip.h               |  3 +--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index c5c080dafb6d..b560f0693aed 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -2336,7 +2336,7 @@ ScriptTextEditor::ScriptTextEditor() {
 
 	SET_DRAG_FORWARDING_GCD(code_editor->get_text_editor(), ScriptTextEditor);
 
-	symbol_tooltip = memnew(SymbolTooltip(code_editor));
+	symbol_tooltip = memnew(SymbolTooltip(code_editor->get_text_editor()));
 	add_child(symbol_tooltip);
 }
 
diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 40fa0f8a44bc..3d7a46f5f117 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -35,11 +35,8 @@
 #include "modules/gdscript/editor/gdscript_highlighter.h"
 #include <queue>
 
-SymbolTooltip::SymbolTooltip(CodeTextEditor *code_editor) :
-		code_editor(code_editor) {
-	// Initialize the tooltip components.
-	text_editor = code_editor->get_text_editor();
-
+SymbolTooltip::SymbolTooltip(CodeEdit *p_text_editor) :
+		text_editor(p_text_editor) {
 	Ref<GDScriptSyntaxHighlighter> highlighter;
 	highlighter.instantiate();
 
@@ -150,7 +147,7 @@ void SymbolTooltip::_close_tooltip() {
 	hide();
 }
 
-void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &script) {
+void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &p_script) {
 	String symbol_word = _get_symbol_word(mouse_position);
 	if (symbol_word.is_empty()) {
 		last_symbol_word = "";
@@ -166,7 +163,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 		last_symbol_word = symbol_word;
 	}
 
-	ExtendGDScriptParser *parser = _get_script_parser(script);
+	ExtendGDScriptParser *parser = _get_script_parser(p_script);
 	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
 	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, symbol_word);
 
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index ed0be831bb99..3ea4594f1b26 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -41,7 +41,6 @@
 class SymbolTooltip : public PanelContainer {
 	GDCLASS(SymbolTooltip, PanelContainer);
 
-	CodeTextEditor *code_editor = nullptr;
 	CodeEdit *text_editor = nullptr;
 	PanelContainer *panel_container = nullptr;
 	VBoxContainer *layout_container = nullptr;
@@ -72,7 +71,7 @@ class SymbolTooltip : public PanelContainer {
 
 public:
 	void update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &script);
-	SymbolTooltip(CodeTextEditor *code_editor);
+	SymbolTooltip(CodeEdit *p_text_editor);
 	~SymbolTooltip();
 };
 

From 73c5b89ac1943405712d6834c231f2a449bf81e6 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 04:03:34 -0400
Subject: [PATCH 41/56] Dynamic body width now actually adjusts to fit content.

---
 editor/symbol_tooltip.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 3d7a46f5f117..71d20d17d6e0 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -228,11 +228,13 @@ void SymbolTooltip::_update_tooltip_size() {
 	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
 	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
 	String header_text = header_label->get_text();
+	String body_text = body_label->get_parsed_text();
 	Ref<Theme> body_theme = body_label->get_theme();
 	Ref<StyleBox> body_style_box = body_theme->get_stylebox("normal", "RichTextLabel");
 
 	// Calculate content size and style box paddings
 	Size2 header_content_size = font->get_string_size(header_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
+	Size2 body_content_size = font->get_string_size(body_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
 	real_t header_h_padding = header_style_box->get_content_margin(SIDE_LEFT) + header_style_box->get_content_margin(SIDE_RIGHT);
 	//real_t header_v_padding = header_style_box->get_content_margin(SIDE_TOP) + header_style_box->get_content_margin(SIDE_BOTTOM);
 	real_t body_h_padding = body_style_box->get_content_margin(SIDE_LEFT) + body_style_box->get_content_margin(SIDE_RIGHT);
@@ -240,7 +242,7 @@ void SymbolTooltip::_update_tooltip_size() {
 
 	// Determine tooltip width based on max width, header width, and body visibility
 	real_t header_width = header_content_size.width + header_h_padding;
-	real_t body_width = body_label->get_content_width() + body_h_padding;
+	real_t body_width = body_content_size.width + body_h_padding;
 	real_t tooltip_width = MIN(MAX_WIDTH, MAX(header_width, body_label->is_visible() ? body_width : 0) + 10); // TODO: Should be +2, but +10 is needed and I'm not sure why.
 
 	// Set sizes

From 26e7699edebb21f2a2b3de4e50e709d24b703769 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 04:09:32 -0400
Subject: [PATCH 42/56] Moved content logic into separate functions.

---
 editor/symbol_tooltip.cpp | 38 ++++++++++++++++++++++++++++++++------
 editor/symbol_tooltip.h   |  4 ++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 71d20d17d6e0..5b15fc576e20 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -172,13 +172,9 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 		return;
 	}
 
-	// Get the documentation of the word under the mouse cursor.
-	String official_documentation = _get_doc_of_word(symbol_word);
-	String comment_documentation = member_symbol->documentation;
-
 	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
-	String header_content = member_symbol->reduced_detail.is_empty() ? symbol_word : member_symbol->reduced_detail;
-	String body_content = comment_documentation.replace("\n ", " ");
+	String header_content = _get_header_content(symbol_word, member_symbol);
+	String body_content = _get_body_content(member_symbol);
 	_update_tooltip_content(header_content, body_content);
 	_update_tooltip_size();
 
@@ -199,6 +195,22 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 	}
 }
 
+String SymbolTooltip::_get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol) {
+	if (member_symbol->reduced_detail.is_empty()) {
+		return symbol_word;
+	}
+	return member_symbol->reduced_detail;
+}
+
+String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *member_symbol) {
+	String body_content = "";
+	if (member_symbol != nullptr) {
+		// Append relevant docstrings.
+		body_content += member_symbol->documentation.replace("\n ", " ");
+	}
+	return body_content;
+}
+
 String SymbolTooltip::_get_symbol_word(const Vector2 &mouse_position) {
 	// Get the word under the mouse cursor.
 	return text_editor->get_word_at_pos(mouse_position);
@@ -286,6 +298,9 @@ String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
 
 		if (class_doc.name == symbol_word) {
 			documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
+			if (documentation.is_empty()) {
+				documentation = class_doc.description.strip_edges();
+			}
 			break;
 		}
 
@@ -298,6 +313,17 @@ String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
 			}
 		}
 
+		for (int i = 0; i < class_doc.constants.size(); ++i) {
+			const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
+
+			if (constant_doc.name == symbol_word) {
+				if (constant_doc.is_value_valid) {
+					documentation = constant_doc.value.strip_edges();
+				}
+				break;
+			}
+		}
+
 		if (!documentation.is_empty()) {
 			break;
 		}
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 3ea4594f1b26..794b66fe732c 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -51,7 +51,11 @@ class SymbolTooltip : public PanelContainer {
 	bool mouse_inside;
 
 	String _get_doc_of_word(const String &symbol_word);
+	String _get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol);
+	String _get_body_content(const lsp::DocumentSymbol *member_symbol);
 	void _update_header_label(const String &symbol_word);
+	// String _get_header_content(String symbol_word, bool is_builtin, const lsp::DocumentSymbol *member_symbol);
+	// String _get_body_content(String official_documentation, bool is_builtin, const lsp::DocumentSymbol *member_symbol);
 	void _update_body_label(const String &documentation);
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();

From e317b43b45ad73132883821af52ebc60c460b49e Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 20:06:22 -0400
Subject: [PATCH 43/56] Added tooltip docs for built-in symbols + minor
 refactoring.

---
 editor/symbol_tooltip.cpp | 98 ++++++++++++++++++++++++++++++---------
 editor/symbol_tooltip.h   | 13 +++---
 2 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 5b15fc576e20..84f7b37e0869 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -163,22 +163,11 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 		last_symbol_word = symbol_word;
 	}
 
-	ExtendGDScriptParser *parser = _get_script_parser(p_script);
-	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
-	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, symbol_word);
-
-	if (member_symbol == nullptr) { // Symbol is not a member of the script.
-		_close_tooltip();
-		return;
-	}
-
-	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
-	String header_content = _get_header_content(symbol_word, member_symbol);
-	String body_content = _get_body_content(member_symbol);
-	_update_tooltip_content(header_content, body_content);
+	_update_tooltip_content(p_script, symbol_word);
 	_update_tooltip_size();
 
-	bool mouse_over_tooltip = get_rect().has_point(mouse_position);
+	Rect2 tooltip_rect = Rect2(get_position(), get_size());
+	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position) && is_visible();
 	if (!mouse_over_tooltip) {
 		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, mouse_position);
 		if (tooltip_position == Vector2(-1, -1)) { // If position is invalid.
@@ -195,19 +184,65 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 	}
 }
 
-String SymbolTooltip::_get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol) {
-	if (member_symbol->reduced_detail.is_empty()) {
+String SymbolTooltip::_get_class_method_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word) {
+	for (int i = 0; i < class_doc.methods.size(); ++i) {
+		const DocData::MethodDoc &method_doc = class_doc.methods[i];
+
+		if (method_doc.name == symbol_word) {
+			return method_doc.description.strip_edges();
+		}
+	}
+	return "";
+}
+
+String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word) {
+	for (int i = 0; i < class_doc.constants.size(); ++i) {
+		const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
+
+		if (constant_doc.name == symbol_word) {
+			if (constant_doc.is_value_valid) {
+				return constant_doc.value.strip_edges();
+			}
+		}
+	}
+	return "";
+}
+
+String SymbolTooltip::_get_built_in_documentation(const String &symbol_word) {
+	String documentation;
+
+	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
+	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
+		const DocData::ClassDoc &class_doc = E.value;
+
+		if (class_doc.name == "@GDScript" || class_doc.name == "@GlobalScope") {
+			documentation = _get_class_method_documentation(class_doc, symbol_word);
+			if (!documentation.is_empty()) break;
+			documentation = _get_class_constant_documentation(class_doc, symbol_word);
+			if (!documentation.is_empty()) break;
+		}
+	}
+
+	return documentation;
+}
+
+String SymbolTooltip::_get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol, bool is_builtin) {
+	if (is_builtin || member_symbol->reduced_detail.is_empty()) {
 		return symbol_word;
 	}
 	return member_symbol->reduced_detail;
 }
 
-String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *member_symbol) {
+String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *member_symbol, String builtin_doc) {
 	String body_content = "";
 	if (member_symbol != nullptr) {
 		// Append relevant docstrings.
 		body_content += member_symbol->documentation.replace("\n ", " ");
 	}
+	if (!builtin_doc.is_empty()) {
+		// Append official documentation.
+		body_content += builtin_doc;
+	}
 	return body_content;
 }
 
@@ -263,8 +298,27 @@ void SymbolTooltip::_update_tooltip_size() {
 	set_size(Vector2(tooltip_width, -1));
 }
 
-void SymbolTooltip::_update_tooltip_content(const String &header_content, const String &body_content) {
+void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &symbol_word) {
 	// Update the tooltip's header and body.
+
+	// String official_documentation = _get_doc_of_word(symbol_word);
+	String builtin_doc = _get_built_in_documentation(symbol_word);
+	bool is_builtin = !builtin_doc.is_empty();
+
+	ExtendGDScriptParser *parser = _get_script_parser(p_script);
+	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
+	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, symbol_word);
+
+	if (member_symbol == nullptr && !is_builtin) { // Symbol is not a member of the script.
+		_close_tooltip();
+		return;
+	}
+
+	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
+	// Add constant value to the header content. e.g. "PI" becomes "PI = 3.141592653589793" (similar to how we do with ENUMs)
+	String header_content = _get_header_content(symbol_word, member_symbol, is_builtin);
+	String body_content = _get_body_content(member_symbol, builtin_doc);
+
 	_update_header_label(header_content);
 	_update_body_label(body_content);
 }
@@ -289,7 +343,7 @@ void SymbolTooltip::_update_body_label(const String &body_content) {
 	}
 }
 
-String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
+/*String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
 	String documentation;
 
 	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
@@ -329,11 +383,11 @@ String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
 		}
 	}
 
-	/*if (!documentation.is_empty()) {
+	*//*if (!documentation.is_empty()) {
 		print_line(vformat("Documentation for %s:\n%s", symbol_word, documentation));
-	}*/
+	}*//*
 	return documentation;
-}
+}*/
 
 Ref<Theme> SymbolTooltip::_create_panel_theme() {
 	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode).
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 794b66fe732c..f18d3b113f92 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -50,12 +50,13 @@ class SymbolTooltip : public PanelContainer {
 	String last_symbol_word;
 	bool mouse_inside;
 
-	String _get_doc_of_word(const String &symbol_word);
-	String _get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol);
-	String _get_body_content(const lsp::DocumentSymbol *member_symbol);
+	// String _get_doc_of_word(const String &symbol_word);
+	String _get_class_method_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word);
+	String _get_class_constant_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word);
+	String _get_built_in_documentation(const String &symbol_word);
+	String _get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol, bool is_builtin);
+	String _get_body_content(const lsp::DocumentSymbol *member_symbol, String builtin_doc);
 	void _update_header_label(const String &symbol_word);
-	// String _get_header_content(String symbol_word, bool is_builtin, const lsp::DocumentSymbol *member_symbol);
-	// String _get_body_content(String official_documentation, bool is_builtin, const lsp::DocumentSymbol *member_symbol);
 	void _update_body_label(const String &documentation);
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
@@ -66,7 +67,7 @@ class SymbolTooltip : public PanelContainer {
 	String _get_symbol_word(const Vector2 &mouse_position);
 	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
 	void _update_tooltip_size();
-	void _update_tooltip_content(const String &header_content, const String &body_content);
+	void _update_tooltip_content(const Ref<Script> &p_script, const String &symbol_word);
 	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
 	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
 

From f3484186dcf8521e1b6c61ffd7b2c3dd9a7578a6 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 20:32:56 -0400
Subject: [PATCH 44/56] All parameters are now prefixed with 'p_'.

---
 editor/symbol_tooltip.cpp | 112 +++++++++++++++++++-------------------
 editor/symbol_tooltip.h   |  30 +++++-----
 2 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 84f7b37e0869..a7819f5b7902 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -147,8 +147,8 @@ void SymbolTooltip::_close_tooltip() {
 	hide();
 }
 
-void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &p_script) {
-	String symbol_word = _get_symbol_word(mouse_position);
+void SymbolTooltip::update_symbol_tooltip(const Vector2 &p_mouse_position, const Ref<Script> &p_script) {
+	String symbol_word = _get_symbol_word(p_mouse_position);
 	if (symbol_word.is_empty()) {
 		last_symbol_word = "";
 		_close_tooltip();
@@ -167,9 +167,9 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 	_update_tooltip_size();
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
-	bool mouse_over_tooltip = tooltip_rect.has_point(mouse_position) && is_visible();
+	bool mouse_over_tooltip = tooltip_rect.has_point(p_mouse_position) && is_visible();
 	if (!mouse_over_tooltip) {
-		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, mouse_position);
+		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, p_mouse_position);
 		if (tooltip_position == Vector2(-1, -1)) { // If position is invalid.
 			_close_tooltip();
 			return;
@@ -184,22 +184,22 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &mouse_position, const R
 	}
 }
 
-String SymbolTooltip::_get_class_method_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word) {
-	for (int i = 0; i < class_doc.methods.size(); ++i) {
-		const DocData::MethodDoc &method_doc = class_doc.methods[i];
+String SymbolTooltip::_get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
+	for (int i = 0; i < p_class_doc.methods.size(); ++i) {
+		const DocData::MethodDoc &method_doc = p_class_doc.methods[i];
 
-		if (method_doc.name == symbol_word) {
+		if (method_doc.name == p_symbol_word) {
 			return method_doc.description.strip_edges();
 		}
 	}
 	return "";
 }
 
-String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word) {
-	for (int i = 0; i < class_doc.constants.size(); ++i) {
-		const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
+String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
+	for (int i = 0; i < p_class_doc.constants.size(); ++i) {
+		const DocData::ConstantDoc &constant_doc = p_class_doc.constants[i];
 
-		if (constant_doc.name == symbol_word) {
+		if (constant_doc.name == p_symbol_word) {
 			if (constant_doc.is_value_valid) {
 				return constant_doc.value.strip_edges();
 			}
@@ -208,7 +208,7 @@ String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc
 	return "";
 }
 
-String SymbolTooltip::_get_built_in_documentation(const String &symbol_word) {
+String SymbolTooltip::_get_built_in_documentation(const String &p_symbol_word) {
 	String documentation;
 
 	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
@@ -216,9 +216,9 @@ String SymbolTooltip::_get_built_in_documentation(const String &symbol_word) {
 		const DocData::ClassDoc &class_doc = E.value;
 
 		if (class_doc.name == "@GDScript" || class_doc.name == "@GlobalScope") {
-			documentation = _get_class_method_documentation(class_doc, symbol_word);
+			documentation = _get_class_method_documentation(class_doc, p_symbol_word);
 			if (!documentation.is_empty()) break;
-			documentation = _get_class_constant_documentation(class_doc, symbol_word);
+			documentation = _get_class_constant_documentation(class_doc, p_symbol_word);
 			if (!documentation.is_empty()) break;
 		}
 	}
@@ -226,39 +226,39 @@ String SymbolTooltip::_get_built_in_documentation(const String &symbol_word) {
 	return documentation;
 }
 
-String SymbolTooltip::_get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol, bool is_builtin) {
-	if (is_builtin || member_symbol->reduced_detail.is_empty()) {
-		return symbol_word;
+String SymbolTooltip::_get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin) {
+	if (p_is_builtin || p_member_symbol->reduced_detail.is_empty()) {
+		return p_symbol_word;
 	}
-	return member_symbol->reduced_detail;
+	return p_member_symbol->reduced_detail;
 }
 
-String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *member_symbol, String builtin_doc) {
+String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc) {
 	String body_content = "";
-	if (member_symbol != nullptr) {
+	if (p_member_symbol != nullptr) {
 		// Append relevant docstrings.
-		body_content += member_symbol->documentation.replace("\n ", " ");
+		body_content += p_member_symbol->documentation.replace("\n ", " ");
 	}
-	if (!builtin_doc.is_empty()) {
+	if (!p_builtin_doc.is_empty()) {
 		// Append official documentation.
-		body_content += builtin_doc;
+		body_content += p_builtin_doc;
 	}
 	return body_content;
 }
 
-String SymbolTooltip::_get_symbol_word(const Vector2 &mouse_position) {
+String SymbolTooltip::_get_symbol_word(const Vector2 &p_mouse_position) {
 	// Get the word under the mouse cursor.
-	return text_editor->get_word_at_pos(mouse_position);
+	return text_editor->get_word_at_pos(p_mouse_position);
 }
 
-Vector2 SymbolTooltip::_calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position) {
-	Vector2 line_col = text_editor->get_line_column_at_pos(mouse_position);
+Vector2 SymbolTooltip::_calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position) {
+	Vector2 line_col = text_editor->get_line_column_at_pos(p_mouse_position);
 	int row = line_col.y;
 	int col = line_col.x;
 	int num_lines = text_editor->get_line_count();
 	if (row >= 0 && row < num_lines) {
 		String line = text_editor->get_line(row);
-		int symbol_col = _get_word_pos_under_mouse(symbol_word, line, col);
+		int symbol_col = _get_word_pos_under_mouse(p_symbol_word, line, col);
 		if (symbol_col >= 0) {
 			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
 			return text_editor->get_global_position() + symbol_position;
@@ -298,16 +298,16 @@ void SymbolTooltip::_update_tooltip_size() {
 	set_size(Vector2(tooltip_width, -1));
 }
 
-void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &symbol_word) {
+void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word) {
 	// Update the tooltip's header and body.
 
-	// String official_documentation = _get_doc_of_word(symbol_word);
-	String builtin_doc = _get_built_in_documentation(symbol_word);
+	// String official_documentation = _get_doc_of_word(p_symbol_word);
+	String builtin_doc = _get_built_in_documentation(p_symbol_word);
 	bool is_builtin = !builtin_doc.is_empty();
 
 	ExtendGDScriptParser *parser = _get_script_parser(p_script);
 	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
-	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, symbol_word);
+	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, p_symbol_word);
 
 	if (member_symbol == nullptr && !is_builtin) { // Symbol is not a member of the script.
 		_close_tooltip();
@@ -316,41 +316,41 @@ void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 
 	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
 	// Add constant value to the header content. e.g. "PI" becomes "PI = 3.141592653589793" (similar to how we do with ENUMs)
-	String header_content = _get_header_content(symbol_word, member_symbol, is_builtin);
+	String header_content = _get_header_content(p_symbol_word, member_symbol, is_builtin);
 	String body_content = _get_body_content(member_symbol, builtin_doc);
 
 	_update_header_label(header_content);
 	_update_body_label(body_content);
 }
 
-void SymbolTooltip::_update_header_label(const String &header_content) {
+void SymbolTooltip::_update_header_label(const String &p_header_content) {
 	// Set the tooltip's header text.
-	header_label->set_text(header_content);
+	header_label->set_text(p_header_content);
 }
 
-void SymbolTooltip::_update_body_label(const String &body_content) {
+void SymbolTooltip::_update_body_label(const String &p_body_content) {
 	// Set the tooltip's body text.
-	if (body_content.is_empty()) {
+	if (p_body_content.is_empty()) {
 		if (body_label->is_visible()) {
 			body_label->hide();
 		}
 		return;
 	}
 	body_label->clear();
-	_add_text_to_rt(body_content, body_label, layout_container);
+	_add_text_to_rt(p_body_content, body_label, layout_container);
 	if (!body_label->is_visible()) {
 		body_label->show();
 	}
 }
 
-/*String SymbolTooltip::_get_doc_of_word(const String &symbol_word) {
+/*String SymbolTooltip::_get_doc_of_word(const String &p_symbol_word) {
 	String documentation;
 
 	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
 	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
 		const DocData::ClassDoc &class_doc = E.value;
 
-		if (class_doc.name == symbol_word) {
+		if (class_doc.name == p_symbol_word) {
 			documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
 			if (documentation.is_empty()) {
 				documentation = class_doc.description.strip_edges();
@@ -361,7 +361,7 @@ void SymbolTooltip::_update_body_label(const String &body_content) {
 		for (int i = 0; i < class_doc.methods.size(); ++i) {
 			const DocData::MethodDoc &method_doc = class_doc.methods[i];
 
-			if (method_doc.name == symbol_word) {
+			if (method_doc.name == p_symbol_word) {
 				documentation = method_doc.description.strip_edges();
 				break;
 			}
@@ -370,7 +370,7 @@ void SymbolTooltip::_update_body_label(const String &body_content) {
 		for (int i = 0; i < class_doc.constants.size(); ++i) {
 			const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
 
-			if (constant_doc.name == symbol_word) {
+			if (constant_doc.name == p_symbol_word) {
 				if (constant_doc.is_value_valid) {
 					documentation = constant_doc.value.strip_edges();
 				}
@@ -384,7 +384,7 @@ void SymbolTooltip::_update_body_label(const String &body_content) {
 	}
 
 	*//*if (!documentation.is_empty()) {
-		print_line(vformat("Documentation for %s:\n%s", symbol_word, documentation));
+		print_line(vformat("Documentation for %s:\n%s", p_symbol_word, documentation));
 	}*//*
 	return documentation;
 }*/
@@ -434,16 +434,16 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 	return theme;
 }
 
-int SymbolTooltip::_get_word_pos_under_mouse(const String &symbol_word, const String &p_search, int mouse_x) const {
+int SymbolTooltip::_get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const {
 	// Created this because _get_column_pos_of_word() only gets the column position of the first occurrence of the word in the line.
 
 	// Early exit if the symbol word is empty, the search string is empty, or the mouse is outside the string.
-	if (symbol_word.is_empty() || p_search.is_empty() || mouse_x < 0 || mouse_x >= p_search.length()) {
+	if (p_symbol_word.is_empty() || p_search.is_empty() || p_mouse_x < 0 || p_mouse_x >= p_search.length()) {
 		return -1;
 	}
 
-	int start = mouse_x;
-	int end = mouse_x;
+	int start = p_mouse_x;
+	int end = p_mouse_x;
 
 	// Extend the start and end until they reach the beginning or end of the word.
 	while (start > 0 && is_ascii_identifier_char(p_search[start - 1])) {
@@ -456,7 +456,7 @@ int SymbolTooltip::_get_word_pos_under_mouse(const String &symbol_word, const St
 	String word_under_mouse = p_search.substr(start, end - start);
 
 	// If the word under the mouse matches the symbol word, return the start position.
-	if (word_under_mouse == symbol_word) {
+	if (word_under_mouse == p_symbol_word) {
 		return start + 1; // Note: +1 is added to account for zero-based indexing.
 	}
 
@@ -482,15 +482,15 @@ int SymbolTooltip::_get_word_pos_under_mouse(const String &symbol_word, const St
 	return nullptr;
 }*/
 
-const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &symbol_word) {
+const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &p_symbol_word) {
 	for (int i = 0; i < node->members.size(); ++i) {
 		const GDScriptParser::ClassNode::Member &member = node->members[i];
 
-		if (member.get_name() == symbol_word) {
+		if (member.get_name() == p_symbol_word) {
 			// Found the symbol.
 			return &member;
 		} else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
-			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, symbol_word);
+			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, p_symbol_word);
 			if (found_symbol) {
 				return found_symbol;
 			}
@@ -531,13 +531,13 @@ ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_scr
 
 // TODO: Need to find the correct symbol instance instead of just the first match.
 const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
-		HashMap<String, const lsp::DocumentSymbol *> &members,
-		const String &symbol_word) { // , const Vector2 &symbol_position) {
+		HashMap<String, const lsp::DocumentSymbol *> &p_members,
+		const String &p_symbol_word) { // , const Vector2 &symbol_position) {
 	// Use a queue to implement breadth-first search.
 	std::queue<const lsp::DocumentSymbol *> queue;
 
 	// Add all members to the queue.
-	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : members) {
+	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : p_members) {
 		queue.push(E.value);
 	}
 
@@ -548,7 +548,7 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		queue.pop();
 
 		// If the name matches, return the symbol.
-		if (symbol->name == symbol_word && !symbol->detail.is_empty()) { // && symbol->range.is_point_inside(symbol_position)) {
+		if (symbol->name == p_symbol_word && !symbol->detail.is_empty()) { // && symbol->range.is_point_inside(symbol_position)) {
 			return symbol;
 		}
 
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index f18d3b113f92..c9ee4bc0f165 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -50,32 +50,32 @@ class SymbolTooltip : public PanelContainer {
 	String last_symbol_word;
 	bool mouse_inside;
 
-	// String _get_doc_of_word(const String &symbol_word);
-	String _get_class_method_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word);
-	String _get_class_constant_documentation(const DocData::ClassDoc &class_doc, const String &symbol_word);
-	String _get_built_in_documentation(const String &symbol_word);
-	String _get_header_content(String symbol_word, const lsp::DocumentSymbol *member_symbol, bool is_builtin);
-	String _get_body_content(const lsp::DocumentSymbol *member_symbol, String builtin_doc);
-	void _update_header_label(const String &symbol_word);
-	void _update_body_label(const String &documentation);
+	// String _get_doc_of_word(const String &p_symbol_word);
+	String _get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word);
+	String _get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word);
+	String _get_built_in_documentation(const String &p_symbol_word);
+	String _get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin);
+	String _get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc);
+	void _update_header_label(const String &p_header_content);
+	void _update_body_label(const String &p_body_content);
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();
-	int _get_word_pos_under_mouse(const String &symbol_word, const String &p_search, int mouse_x) const;
+	int _get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const;
 	void _on_tooltip_delay_timeout();
 	void _close_tooltip();
-	String _get_symbol_word(const Vector2 &mouse_position);
-	Vector2 _calculate_tooltip_position(const String &symbol_word, const Vector2 &mouse_position);
+	String _get_symbol_word(const Vector2 &p_mouse_position);
+	Vector2 _calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position);
 	void _update_tooltip_size();
-	void _update_tooltip_content(const Ref<Script> &p_script, const String &symbol_word);
+	void _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
 	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
-	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
+	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
 
 protected:
 	void _notification(int p_what);
 
 public:
-	void update_symbol_tooltip(const Vector2 &mouse_position, const Ref<Script> &script);
+	void update_symbol_tooltip(const Vector2 &p_mouse_position, const Ref<Script> &p_script);
 	SymbolTooltip(CodeEdit *p_text_editor);
 	~SymbolTooltip();
 };
@@ -83,6 +83,6 @@ class SymbolTooltip : public PanelContainer {
 // static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
 // static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script);
 // static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script);
-// const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &members, const String &symbol_word);
+// const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
 
 #endif // SYMBOL_TOOLTIP_H

From a4f68bca4adb3cdc4b84dc7e02daedf2667e5db6 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 20:55:32 -0400
Subject: [PATCH 45/56] Rearranged class methods.

---
 editor/symbol_tooltip.cpp | 431 +++++++++++++++++++-------------------
 editor/symbol_tooltip.h   |  24 ++-
 2 files changed, 229 insertions(+), 226 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index a7819f5b7902..56690cbeaa56 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -184,87 +184,34 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &p_mouse_position, const
 	}
 }
 
-String SymbolTooltip::_get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
-	for (int i = 0; i < p_class_doc.methods.size(); ++i) {
-		const DocData::MethodDoc &method_doc = p_class_doc.methods[i];
-
-		if (method_doc.name == p_symbol_word) {
-			return method_doc.description.strip_edges();
-		}
-	}
-	return "";
-}
-
-String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
-	for (int i = 0; i < p_class_doc.constants.size(); ++i) {
-		const DocData::ConstantDoc &constant_doc = p_class_doc.constants[i];
-
-		if (constant_doc.name == p_symbol_word) {
-			if (constant_doc.is_value_valid) {
-				return constant_doc.value.strip_edges();
-			}
-		}
-	}
-	return "";
+String SymbolTooltip::_get_symbol_word(const Vector2 &p_mouse_position) {
+	// Get the word under the mouse cursor.
+	return text_editor->get_word_at_pos(p_mouse_position);
 }
 
-String SymbolTooltip::_get_built_in_documentation(const String &p_symbol_word) {
-	String documentation;
-
-	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
-	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
-		const DocData::ClassDoc &class_doc = E.value;
-
-		if (class_doc.name == "@GDScript" || class_doc.name == "@GlobalScope") {
-			documentation = _get_class_method_documentation(class_doc, p_symbol_word);
-			if (!documentation.is_empty()) break;
-			documentation = _get_class_constant_documentation(class_doc, p_symbol_word);
-			if (!documentation.is_empty()) break;
-		}
-	}
+void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word) {
+	// Update the tooltip's header and body.
 
-	return documentation;
-}
+	// String official_documentation = _get_doc_of_word(p_symbol_word);
+	String builtin_doc = _get_built_in_documentation(p_symbol_word);
+	bool is_builtin = !builtin_doc.is_empty();
 
-String SymbolTooltip::_get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin) {
-	if (p_is_builtin || p_member_symbol->reduced_detail.is_empty()) {
-		return p_symbol_word;
-	}
-	return p_member_symbol->reduced_detail;
-}
+	ExtendGDScriptParser *parser = _get_script_parser(p_script);
+	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
+	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, p_symbol_word);
 
-String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc) {
-	String body_content = "";
-	if (p_member_symbol != nullptr) {
-		// Append relevant docstrings.
-		body_content += p_member_symbol->documentation.replace("\n ", " ");
-	}
-	if (!p_builtin_doc.is_empty()) {
-		// Append official documentation.
-		body_content += p_builtin_doc;
+	if (member_symbol == nullptr && !is_builtin) { // Symbol is not a member of the script.
+		_close_tooltip();
+		return;
 	}
-	return body_content;
-}
 
-String SymbolTooltip::_get_symbol_word(const Vector2 &p_mouse_position) {
-	// Get the word under the mouse cursor.
-	return text_editor->get_word_at_pos(p_mouse_position);
-}
+	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
+	// Add constant value to the header content. e.g. "PI" becomes "PI = 3.141592653589793" (similar to how we do with ENUMs)
+	String header_content = _get_header_content(p_symbol_word, member_symbol, is_builtin);
+	String body_content = _get_body_content(member_symbol, builtin_doc);
 
-Vector2 SymbolTooltip::_calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position) {
-	Vector2 line_col = text_editor->get_line_column_at_pos(p_mouse_position);
-	int row = line_col.y;
-	int col = line_col.x;
-	int num_lines = text_editor->get_line_count();
-	if (row >= 0 && row < num_lines) {
-		String line = text_editor->get_line(row);
-		int symbol_col = _get_word_pos_under_mouse(p_symbol_word, line, col);
-		if (symbol_col >= 0) {
-			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-			return text_editor->get_global_position() + symbol_position;
-		}
-	}
-	return Vector2(-1, -1); // Indicates an invalid position.
+	_update_header_label(header_content);
+	_update_body_label(body_content);
 }
 
 void SymbolTooltip::_update_tooltip_size() {
@@ -298,29 +245,127 @@ void SymbolTooltip::_update_tooltip_size() {
 	set_size(Vector2(tooltip_width, -1));
 }
 
-void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word) {
-	// Update the tooltip's header and body.
+Vector2 SymbolTooltip::_calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position) {
+	Vector2 line_col = text_editor->get_line_column_at_pos(p_mouse_position);
+	int row = line_col.y;
+	int col = line_col.x;
+	int num_lines = text_editor->get_line_count();
+	if (row >= 0 && row < num_lines) {
+		String line = text_editor->get_line(row);
+		int symbol_col = _get_word_pos_under_mouse(p_symbol_word, line, col);
+		if (symbol_col >= 0) {
+			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
+			return text_editor->get_global_position() + symbol_position;
+		}
+	}
+	return Vector2(-1, -1); // Indicates an invalid position.
+}
 
-	// String official_documentation = _get_doc_of_word(p_symbol_word);
-	String builtin_doc = _get_built_in_documentation(p_symbol_word);
-	bool is_builtin = !builtin_doc.is_empty();
+String SymbolTooltip::_get_built_in_documentation(const String &p_symbol_word) {
+	String documentation;
 
-	ExtendGDScriptParser *parser = _get_script_parser(p_script);
-	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
-	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, p_symbol_word);
+	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
+	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
+		const DocData::ClassDoc &class_doc = E.value;
 
-	if (member_symbol == nullptr && !is_builtin) { // Symbol is not a member of the script.
-		_close_tooltip();
-		return;
+		if (class_doc.name == "@GDScript" || class_doc.name == "@GlobalScope") {
+			documentation = _get_class_method_documentation(class_doc, p_symbol_word);
+			if (!documentation.is_empty()) break;
+			documentation = _get_class_constant_documentation(class_doc, p_symbol_word);
+			if (!documentation.is_empty()) break;
+		}
 	}
 
-	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
-	// Add constant value to the header content. e.g. "PI" becomes "PI = 3.141592653589793" (similar to how we do with ENUMs)
-	String header_content = _get_header_content(p_symbol_word, member_symbol, is_builtin);
-	String body_content = _get_body_content(member_symbol, builtin_doc);
+	return documentation;
+}
 
-	_update_header_label(header_content);
-	_update_body_label(body_content);
+ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_script) {
+	// Create and initialize the parser.
+	ExtendGDScriptParser *parser = memnew(ExtendGDScriptParser);
+	Error err = parser->parse(p_script->get_source_code(), p_script->get_path());
+
+	if (err != OK) {
+		ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
+		return nullptr;
+	}
+
+	return parser;
+}
+
+// TODO: Need to find the correct symbol instance instead of just the first match.
+const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
+		HashMap<String, const lsp::DocumentSymbol *> &p_members,
+		const String &p_symbol_word) { // , const Vector2 &symbol_position) {
+	// Use a queue to implement breadth-first search.
+	std::queue<const lsp::DocumentSymbol *> queue;
+
+	// Add all members to the queue.
+	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : p_members) {
+		queue.push(E.value);
+	}
+
+	// While there are still elements in the queue.
+	while (!queue.empty()) {
+		// Get the next symbol.
+		const lsp::DocumentSymbol *symbol = queue.front();
+		queue.pop();
+
+		// If the name matches, return the symbol.
+		if (symbol->name == p_symbol_word && !symbol->detail.is_empty()) { // && symbol->range.is_point_inside(symbol_position)) {
+			return symbol;
+		}
+
+		// Add the children to the queue for later processing.
+		for (int i = 0; i < symbol->children.size(); ++i) {
+			queue.push(&symbol->children[i]);
+		}
+	}
+
+	return nullptr; // If the symbol is not found, return nullptr.
+}
+
+String SymbolTooltip::_get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
+	for (int i = 0; i < p_class_doc.methods.size(); ++i) {
+		const DocData::MethodDoc &method_doc = p_class_doc.methods[i];
+
+		if (method_doc.name == p_symbol_word) {
+			return method_doc.description.strip_edges();
+		}
+	}
+	return "";
+}
+
+String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
+	for (int i = 0; i < p_class_doc.constants.size(); ++i) {
+		const DocData::ConstantDoc &constant_doc = p_class_doc.constants[i];
+
+		if (constant_doc.name == p_symbol_word) {
+			if (constant_doc.is_value_valid) {
+				return constant_doc.value.strip_edges();
+			}
+		}
+	}
+	return "";
+}
+
+String SymbolTooltip::_get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin) {
+	if (p_is_builtin || p_member_symbol->reduced_detail.is_empty()) {
+		return p_symbol_word;
+	}
+	return p_member_symbol->reduced_detail;
+}
+
+String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc) {
+	String body_content = "";
+	if (p_member_symbol != nullptr) {
+		// Append relevant docstrings.
+		body_content += p_member_symbol->documentation.replace("\n ", " ");
+	}
+	if (!p_builtin_doc.is_empty()) {
+		// Append official documentation.
+		body_content += p_builtin_doc;
+	}
+	return body_content;
 }
 
 void SymbolTooltip::_update_header_label(const String &p_header_content) {
@@ -343,51 +388,34 @@ void SymbolTooltip::_update_body_label(const String &p_body_content) {
 	}
 }
 
-/*String SymbolTooltip::_get_doc_of_word(const String &p_symbol_word) {
-	String documentation;
-
-	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
-	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
-		const DocData::ClassDoc &class_doc = E.value;
-
-		if (class_doc.name == p_symbol_word) {
-			documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
-			if (documentation.is_empty()) {
-				documentation = class_doc.description.strip_edges();
-			}
-			break;
-		}
+int SymbolTooltip::_get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const {
+	// Created this because _get_column_pos_of_word() only gets the column position of the first occurrence of the word in the line.
 
-		for (int i = 0; i < class_doc.methods.size(); ++i) {
-			const DocData::MethodDoc &method_doc = class_doc.methods[i];
+	// Early exit if the symbol word is empty, the search string is empty, or the mouse is outside the string.
+	if (p_symbol_word.is_empty() || p_search.is_empty() || p_mouse_x < 0 || p_mouse_x >= p_search.length()) {
+		return -1;
+	}
 
-			if (method_doc.name == p_symbol_word) {
-				documentation = method_doc.description.strip_edges();
-				break;
-			}
-		}
+	int start = p_mouse_x;
+	int end = p_mouse_x;
 
-		for (int i = 0; i < class_doc.constants.size(); ++i) {
-			const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
+	// Extend the start and end until they reach the beginning or end of the word.
+	while (start > 0 && is_ascii_identifier_char(p_search[start - 1])) {
+		start--;
+	}
+	while (end < p_search.length() && is_ascii_identifier_char(p_search[end])) {
+		end++;
+	}
 
-			if (constant_doc.name == p_symbol_word) {
-				if (constant_doc.is_value_valid) {
-					documentation = constant_doc.value.strip_edges();
-				}
-				break;
-			}
-		}
+	String word_under_mouse = p_search.substr(start, end - start);
 
-		if (!documentation.is_empty()) {
-			break;
-		}
+	// If the word under the mouse matches the symbol word, return the start position.
+	if (word_under_mouse == p_symbol_word) {
+		return start + 1; // Note: +1 is added to account for zero-based indexing.
 	}
 
-	*//*if (!documentation.is_empty()) {
-		print_line(vformat("Documentation for %s:\n%s", p_symbol_word, documentation));
-	}*//*
-	return documentation;
-}*/
+	return -1; // Return -1 if no match is found.
+}
 
 Ref<Theme> SymbolTooltip::_create_panel_theme() {
 	Ref<Theme> theme = memnew(Theme); // TODO: Get the global theme instead (e.g. dark mode, light mode).
@@ -434,35 +462,70 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 	return theme;
 }
 
-int SymbolTooltip::_get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const {
-	// Created this because _get_column_pos_of_word() only gets the column position of the first occurrence of the word in the line.
+/*const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &p_symbol_word) {
+	for (int i = 0; i < node->members.size(); ++i) {
+		const GDScriptParser::ClassNode::Member &member = node->members[i];
 
-	// Early exit if the symbol word is empty, the search string is empty, or the mouse is outside the string.
-	if (p_symbol_word.is_empty() || p_search.is_empty() || p_mouse_x < 0 || p_mouse_x >= p_search.length()) {
-		return -1;
+		if (member.get_name() == p_symbol_word) {
+			// Found the symbol.
+			return &member;
+		} else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
+			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, p_symbol_word);
+			if (found_symbol) {
+				return found_symbol;
+			}
+		}
 	}
 
-	int start = p_mouse_x;
-	int end = p_mouse_x;
+	return nullptr;
+}*/
 
-	// Extend the start and end until they reach the beginning or end of the word.
-	while (start > 0 && is_ascii_identifier_char(p_search[start - 1])) {
-		start--;
+/*String SymbolTooltip::_get_doc_of_word(const String &p_symbol_word) {
+	String documentation;
+
+const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
+for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
+	const DocData::ClassDoc &class_doc = E.value;
+
+	if (class_doc.name == p_symbol_word) {
+		documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
+		if (documentation.is_empty()) {
+			documentation = class_doc.description.strip_edges();
+		}
+		break;
 	}
-	while (end < p_search.length() && is_ascii_identifier_char(p_search[end])) {
-		end++;
+
+	for (int i = 0; i < class_doc.methods.size(); ++i) {
+		const DocData::MethodDoc &method_doc = class_doc.methods[i];
+
+		if (method_doc.name == p_symbol_word) {
+			documentation = method_doc.description.strip_edges();
+			break;
+		}
 	}
 
-	String word_under_mouse = p_search.substr(start, end - start);
+	for (int i = 0; i < class_doc.constants.size(); ++i) {
+		const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
 
-	// If the word under the mouse matches the symbol word, return the start position.
-	if (word_under_mouse == p_symbol_word) {
-		return start + 1; // Note: +1 is added to account for zero-based indexing.
+		if (constant_doc.name == p_symbol_word) {
+			if (constant_doc.is_value_valid) {
+				documentation = constant_doc.value.strip_edges();
+			}
+			break;
+		}
 	}
 
-	return -1; // Return -1 if no match is found.
+	if (!documentation.is_empty()) {
+		break;
+	}
 }
 
+*//*if (!documentation.is_empty()) {
+		print_line(vformat("Documentation for %s:\n%s", p_symbol_word, documentation));
+}*//*
+		return documentation;
+}*/
+
 // Copied from script_text_editor.cpp
 /*static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
 	if (p_current->get_owner() != p_base && p_base != p_current) {
@@ -479,84 +542,22 @@ int SymbolTooltip::_get_word_pos_under_mouse(const String &p_symbol_word, const
 		}
 	}
 
-	return nullptr;
+return nullptr;
 }*/
 
-const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &p_symbol_word) {
-	for (int i = 0; i < node->members.size(); ++i) {
-		const GDScriptParser::ClassNode::Member &member = node->members[i];
-
-		if (member.get_name() == p_symbol_word) {
-			// Found the symbol.
-			return &member;
-		} else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
-			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, p_symbol_word);
-			if (found_symbol) {
-				return found_symbol;
-			}
-		}
-	}
-
-	return nullptr;
-}
-
 // Gets the head of the GDScriptParser AST tree.
 /*static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script) {
 	// Create and initialize the parser.
 	GDScriptParser *parser = memnew(GDScriptParser);
 	Error err = parser->parse(p_script->get_source_code(), p_script->get_path(), false);
 
-	if (err != OK) {
-		ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
-		return nullptr;
-	}
-
-	// Get the AST tree.
-	const GDScriptParser::ClassNode *ast_tree = parser->get_tree();
-	return ast_tree;
-}*/
-
-ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_script) {
-	// Create and initialize the parser.
-	ExtendGDScriptParser *parser = memnew(ExtendGDScriptParser);
-	Error err = parser->parse(p_script->get_source_code(), p_script->get_path());
-
-	if (err != OK) {
-		ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
-		return nullptr;
-	}
-
-	return parser;
+if (err != OK) {
+	ERR_PRINT("Failed to parse GDScript with GDScriptParser.");
+	return nullptr;
 }
 
-// TODO: Need to find the correct symbol instance instead of just the first match.
-const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
-		HashMap<String, const lsp::DocumentSymbol *> &p_members,
-		const String &p_symbol_word) { // , const Vector2 &symbol_position) {
-	// Use a queue to implement breadth-first search.
-	std::queue<const lsp::DocumentSymbol *> queue;
-
-	// Add all members to the queue.
-	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : p_members) {
-		queue.push(E.value);
-	}
-
-	// While there are still elements in the queue.
-	while (!queue.empty()) {
-		// Get the next symbol.
-		const lsp::DocumentSymbol *symbol = queue.front();
-		queue.pop();
-
-		// If the name matches, return the symbol.
-		if (symbol->name == p_symbol_word && !symbol->detail.is_empty()) { // && symbol->range.is_point_inside(symbol_position)) {
-			return symbol;
-		}
-
-		// Add the children to the queue for later processing.
-		for (int i = 0; i < symbol->children.size(); ++i) {
-			queue.push(&symbol->children[i]);
-		}
-	}
+// Get the AST tree.
+const GDScriptParser::ClassNode *ast_tree = parser->get_tree();
+return ast_tree;
+}*/
 
-	return nullptr; // If the symbol is not found, return nullptr.
-}
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index c9ee4bc0f165..9789b50b5a5c 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -50,26 +50,28 @@ class SymbolTooltip : public PanelContainer {
 	String last_symbol_word;
 	bool mouse_inside;
 
-	// String _get_doc_of_word(const String &p_symbol_word);
+	void _on_tooltip_delay_timeout();
+	void _close_tooltip();
+	String _get_symbol_word(const Vector2 &p_mouse_position);
+	void _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
+	void _update_tooltip_size();
+	Vector2 _calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position);
+	String _get_built_in_documentation(const String &p_symbol_word);
+	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
+	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
 	String _get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word);
 	String _get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word);
-	String _get_built_in_documentation(const String &p_symbol_word);
+
 	String _get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin);
 	String _get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc);
 	void _update_header_label(const String &p_header_content);
 	void _update_body_label(const String &p_body_content);
+	int _get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const;
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();
-	int _get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const;
-	void _on_tooltip_delay_timeout();
-	void _close_tooltip();
-	String _get_symbol_word(const Vector2 &p_mouse_position);
-	Vector2 _calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position);
-	void _update_tooltip_size();
-	void _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
-	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
-	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
+
+	// String _get_doc_of_word(const String &p_symbol_word);
 
 protected:
 	void _notification(int p_what);

From e4b5d58521604f286567fc2ab1f3e4134888aede Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 10 Sep 2023 20:57:15 -0400
Subject: [PATCH 46/56] Update
 modules/gdscript/language_server/gdscript_extend_parser.cpp

Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
---
 modules/gdscript/language_server/gdscript_extend_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 4e2cbbbebe17..0d88559f1e01 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -333,7 +333,7 @@ void ExtendGDScriptParser::parse_enum_value_symbol(const GDScriptParser::EnumNod
 	if (p_value->parent_enum->identifier != nullptr) {
 		r_symbol.detail = String(p_value->parent_enum->identifier->name) + "." + r_symbol.name + " = " + itos(p_value->value);
 	} else {
-		r_symbol.detail = r_symbol.name + " = " + itos(p_value->value);;
+		r_symbol.detail = r_symbol.name + " = " + itos(p_value->value);
 	}
 
 	r_symbol.reduced_detail = r_symbol.detail;

From 6686fb93a67e96d5daf3d10e27376d05431ed1b1 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 11 Sep 2023 01:07:59 -0400
Subject: [PATCH 47/56] Polished symbol info for built-in 'constant' and
 'method' symbols.

---
 editor/symbol_tooltip.cpp | 124 +++++++++++++++++++++++++-------------
 editor/symbol_tooltip.h   |  14 ++---
 2 files changed, 89 insertions(+), 49 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 56690cbeaa56..913dbdcf0303 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -163,7 +163,10 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &p_mouse_position, const
 		last_symbol_word = symbol_word;
 	}
 
-	_update_tooltip_content(p_script, symbol_word);
+	if(!_update_tooltip_content(p_script, symbol_word)) {
+		_close_tooltip();
+		return;
+	}
 	_update_tooltip_size();
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
@@ -189,29 +192,48 @@ String SymbolTooltip::_get_symbol_word(const Vector2 &p_mouse_position) {
 	return text_editor->get_word_at_pos(p_mouse_position);
 }
 
-void SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word) {
+bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word) {
 	// Update the tooltip's header and body.
 
+	bool is_built_in = false;
+	String built_in_header = "";
+	String built_in_body = "";
+	Vector<const DocData::ClassDoc*> class_docs = _get_built_in_class_docs();
+	for (const DocData::ClassDoc *class_doc : class_docs) {
+		const DocData::ConstantDoc *constant_doc = _get_class_constant_doc(class_doc, p_symbol_word);
+		if (constant_doc) {
+			built_in_header = constant_doc->name + " = " + constant_doc->value;
+			is_built_in = true;
+			break;
+		} else {
+			const DocData::MethodDoc *method_doc = _get_class_method_doc(class_doc, p_symbol_word);
+			if (method_doc) {
+				built_in_header = _get_class_method_doc_definition(method_doc);
+				built_in_body = method_doc->description.strip_edges();
+				is_built_in = true;
+				break;
+			}
+		}
+	}
+
 	// String official_documentation = _get_doc_of_word(p_symbol_word);
-	String builtin_doc = _get_built_in_documentation(p_symbol_word);
-	bool is_builtin = !builtin_doc.is_empty();
 
 	ExtendGDScriptParser *parser = _get_script_parser(p_script);
 	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
 	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, p_symbol_word);
 
-	if (member_symbol == nullptr && !is_builtin) { // Symbol is not a member of the script.
-		_close_tooltip();
-		return;
+	if (member_symbol == nullptr && !is_built_in) { // Symbol is not a member of the script.
+		return false;
 	}
 
 	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
 	// Add constant value to the header content. e.g. "PI" becomes "PI = 3.141592653589793" (similar to how we do with ENUMs)
-	String header_content = _get_header_content(p_symbol_word, member_symbol, is_builtin);
-	String body_content = _get_body_content(member_symbol, builtin_doc);
+	String header_content = _get_header_content(p_symbol_word, member_symbol, built_in_header);
+	String body_content = _get_body_content(member_symbol, built_in_body);
 
 	_update_header_label(header_content);
 	_update_body_label(body_content);
+	return true;
 }
 
 void SymbolTooltip::_update_tooltip_size() {
@@ -261,22 +283,12 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &p_symbol_word,
 	return Vector2(-1, -1); // Indicates an invalid position.
 }
 
-String SymbolTooltip::_get_built_in_documentation(const String &p_symbol_word) {
-	String documentation;
-
+Vector<const DocData::ClassDoc*> SymbolTooltip::_get_built_in_class_docs() {
 	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
-	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
-		const DocData::ClassDoc &class_doc = E.value;
-
-		if (class_doc.name == "@GDScript" || class_doc.name == "@GlobalScope") {
-			documentation = _get_class_method_documentation(class_doc, p_symbol_word);
-			if (!documentation.is_empty()) break;
-			documentation = _get_class_constant_documentation(class_doc, p_symbol_word);
-			if (!documentation.is_empty()) break;
-		}
-	}
-
-	return documentation;
+	Vector<const DocData::ClassDoc*> class_docs;
+	class_docs.append(&class_list["@GDScript"]);
+	class_docs.append(&class_list["@GlobalScope"]);
+	return class_docs;
 }
 
 ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_script) {
@@ -324,46 +336,74 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 	return nullptr; // If the symbol is not found, return nullptr.
 }
 
-String SymbolTooltip::_get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
-	for (int i = 0; i < p_class_doc.methods.size(); ++i) {
-		const DocData::MethodDoc &method_doc = p_class_doc.methods[i];
+const DocData::MethodDoc *SymbolTooltip::_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word) {
+	for (int i = 0; i < p_class_doc->methods.size(); ++i) {
+		const DocData::MethodDoc &method_doc = p_class_doc->methods[i];
 
 		if (method_doc.name == p_symbol_word) {
-			return method_doc.description.strip_edges();
+			return &method_doc;
 		}
 	}
-	return "";
+	return nullptr;
 }
 
-String SymbolTooltip::_get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word) {
-	for (int i = 0; i < p_class_doc.constants.size(); ++i) {
-		const DocData::ConstantDoc &constant_doc = p_class_doc.constants[i];
+const DocData::ConstantDoc *SymbolTooltip::_get_class_constant_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word) {
+	for (int i = 0; i < p_class_doc->constants.size(); ++i) {
+		const DocData::ConstantDoc &constant_doc = p_class_doc->constants[i];
 
 		if (constant_doc.name == p_symbol_word) {
 			if (constant_doc.is_value_valid) {
-				return constant_doc.value.strip_edges();
+				return &constant_doc;
 			}
 		}
 	}
-	return "";
+	return nullptr;
 }
 
-String SymbolTooltip::_get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin) {
-	if (p_is_builtin || p_member_symbol->reduced_detail.is_empty()) {
-		return p_symbol_word;
+String SymbolTooltip::_get_class_method_doc_definition(const DocData::MethodDoc *p_method_doc) {
+	String definition = "func " + p_method_doc->name + "(";
+	String parameters;
+	for (int i = 0; i < p_method_doc->arguments.size(); i++) {
+		const DocData::ArgumentDoc &parameter = p_method_doc->arguments[i];
+		if (i > 0) {
+			parameters += ", ";
+		}
+		parameters += parameter.name;
+		if (!parameter.type.is_empty()) {
+			parameters += ": " + parameter.type;
+		}
+	}
+	if (p_method_doc->qualifiers.contains("vararg")) {
+		parameters += parameters.is_empty() ? "..." : ", ...";
+	}
+
+	String return_type = p_method_doc->return_type;
+	if (return_type.is_empty()) {
+		return_type = "void";
+	}
+	definition += parameters + ") -> " + return_type;
+	return definition;
+}
+
+String SymbolTooltip::_get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, String p_built_in_header) {
+	if (p_member_symbol && !p_member_symbol->reduced_detail.is_empty()) {
+		return p_member_symbol->reduced_detail;
+	}
+	if (!p_built_in_header.is_empty()) {
+		return p_built_in_header;
 	}
-	return p_member_symbol->reduced_detail;
+	return p_symbol_word;
 }
 
-String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc) {
+String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_built_in_body) {
 	String body_content = "";
-	if (p_member_symbol != nullptr) {
+	if (p_member_symbol) {
 		// Append relevant docstrings.
 		body_content += p_member_symbol->documentation.replace("\n ", " ");
 	}
-	if (!p_builtin_doc.is_empty()) {
+	if (!p_built_in_body.is_empty()) {
 		// Append official documentation.
-		body_content += p_builtin_doc;
+		body_content += p_built_in_body;
 	}
 	return body_content;
 }
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index 9789b50b5a5c..d4978e2bfdd0 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -53,17 +53,17 @@ class SymbolTooltip : public PanelContainer {
 	void _on_tooltip_delay_timeout();
 	void _close_tooltip();
 	String _get_symbol_word(const Vector2 &p_mouse_position);
-	void _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
+	bool _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
 	void _update_tooltip_size();
 	Vector2 _calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position);
-	String _get_built_in_documentation(const String &p_symbol_word);
+	Vector<const DocData::ClassDoc*> _get_built_in_class_docs();
 	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
 	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
-	String _get_class_method_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word);
-	String _get_class_constant_documentation(const DocData::ClassDoc &p_class_doc, const String &p_symbol_word);
-
-	String _get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, bool p_is_builtin);
-	String _get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_builtin_doc);
+	const DocData::MethodDoc *_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word);
+	const DocData::ConstantDoc *_get_class_constant_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word);
+	String _get_class_method_doc_definition(const DocData::MethodDoc *p_method_doc);
+	String _get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, String p_built_in_header);
+	String _get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_built_in_body);
 	void _update_header_label(const String &p_header_content);
 	void _update_body_label(const String &p_body_content);
 	int _get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const;

From 3782e3316144c461b2eed527b32dc1343707f96a Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 11 Sep 2023 01:18:50 -0400
Subject: [PATCH 48/56] Polished symbol info for built-in 'enum' symbols.

---
 editor/symbol_tooltip.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 913dbdcf0303..a3ac2f1d6a56 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -203,6 +203,10 @@ bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 		const DocData::ConstantDoc *constant_doc = _get_class_constant_doc(class_doc, p_symbol_word);
 		if (constant_doc) {
 			built_in_header = constant_doc->name + " = " + constant_doc->value;
+			if (!constant_doc->enumeration.is_empty()) {
+				built_in_header = constant_doc->enumeration + "." + built_in_header;
+				built_in_body = constant_doc->description.strip_edges();
+			}
 			is_built_in = true;
 			break;
 		} else {

From f7d3155f81b54bcf83d9cf5ce2e9ee8e2d1d694c Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 11 Sep 2023 11:09:31 -0400
Subject: [PATCH 49/56] Formatting adjustments

---
 editor/symbol_tooltip.cpp | 64 ++++++++++++++++++---------------------
 editor/symbol_tooltip.h   |  2 +-
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index a3ac2f1d6a56..9f2ceed1dbf7 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -163,7 +163,7 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &p_mouse_position, const
 		last_symbol_word = symbol_word;
 	}
 
-	if(!_update_tooltip_content(p_script, symbol_word)) {
+	if (!_update_tooltip_content(p_script, symbol_word)) {
 		_close_tooltip();
 		return;
 	}
@@ -198,7 +198,7 @@ bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 	bool is_built_in = false;
 	String built_in_header = "";
 	String built_in_body = "";
-	Vector<const DocData::ClassDoc*> class_docs = _get_built_in_class_docs();
+	Vector<const DocData::ClassDoc *> class_docs = _get_built_in_class_docs();
 	for (const DocData::ClassDoc *class_doc : class_docs) {
 		const DocData::ConstantDoc *constant_doc = _get_class_constant_doc(class_doc, p_symbol_word);
 		if (constant_doc) {
@@ -287,9 +287,9 @@ Vector2 SymbolTooltip::_calculate_tooltip_position(const String &p_symbol_word,
 	return Vector2(-1, -1); // Indicates an invalid position.
 }
 
-Vector<const DocData::ClassDoc*> SymbolTooltip::_get_built_in_class_docs() {
+Vector<const DocData::ClassDoc *> SymbolTooltip::_get_built_in_class_docs() {
 	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
-	Vector<const DocData::ClassDoc*> class_docs;
+	Vector<const DocData::ClassDoc *> class_docs;
 	class_docs.append(&class_list["@GDScript"]);
 	class_docs.append(&class_list["@GlobalScope"]);
 	return class_docs;
@@ -527,47 +527,43 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 /*String SymbolTooltip::_get_doc_of_word(const String &p_symbol_word) {
 	String documentation;
 
-const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
-for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
-	const DocData::ClassDoc &class_doc = E.value;
+	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
+	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
+		const DocData::ClassDoc &class_doc = E.value;
 
-	if (class_doc.name == p_symbol_word) {
-		documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
-		if (documentation.is_empty()) {
-			documentation = class_doc.description.strip_edges();
+		if (class_doc.name == p_symbol_word) {
+			documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
+			if (documentation.is_empty()) {
+				documentation = class_doc.description.strip_edges();
+			}
+			break;
 		}
-		break;
-	}
 
-	for (int i = 0; i < class_doc.methods.size(); ++i) {
-		const DocData::MethodDoc &method_doc = class_doc.methods[i];
+		for (int i = 0; i < class_doc.methods.size(); ++i) {
+			const DocData::MethodDoc &method_doc = class_doc.methods[i];
 
-		if (method_doc.name == p_symbol_word) {
-			documentation = method_doc.description.strip_edges();
-			break;
+			if (method_doc.name == p_symbol_word) {
+				documentation = method_doc.description.strip_edges();
+				break;
+			}
 		}
-	}
 
-	for (int i = 0; i < class_doc.constants.size(); ++i) {
-		const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
+		for (int i = 0; i < class_doc.constants.size(); ++i) {
+			const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
 
-		if (constant_doc.name == p_symbol_word) {
-			if (constant_doc.is_value_valid) {
-				documentation = constant_doc.value.strip_edges();
+			if (constant_doc.name == p_symbol_word) {
+				if (constant_doc.is_value_valid) {
+					documentation = constant_doc.value.strip_edges();
+				}
+				break;
 			}
-			break;
 		}
-	}
 
-	if (!documentation.is_empty()) {
-		break;
+		if (!documentation.is_empty()) {
+			break;
+		}
 	}
-}
-
-*//*if (!documentation.is_empty()) {
-		print_line(vformat("Documentation for %s:\n%s", p_symbol_word, documentation));
-}*//*
-		return documentation;
+	return documentation;
 }*/
 
 // Copied from script_text_editor.cpp
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index d4978e2bfdd0..aa5a32218718 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -56,7 +56,7 @@ class SymbolTooltip : public PanelContainer {
 	bool _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
 	void _update_tooltip_size();
 	Vector2 _calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position);
-	Vector<const DocData::ClassDoc*> _get_built_in_class_docs();
+	Vector<const DocData::ClassDoc *> _get_built_in_class_docs();
 	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
 	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
 	const DocData::MethodDoc *_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word);

From ea8a9a6fe65f3e5dc9f73239942f2f865b7ecc53 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Mon, 11 Sep 2023 11:16:17 -0400
Subject: [PATCH 50/56] Formatting adjustments 2

---
 editor/symbol_tooltip.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 9f2ceed1dbf7..d33c88c161e9 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -600,4 +600,3 @@ if (err != OK) {
 const GDScriptParser::ClassNode *ast_tree = parser->get_tree();
 return ast_tree;
 }*/
-

From 517d25d93ae84c096ff4f0d44b71bb3f81687db1 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Tue, 12 Sep 2023 01:55:59 -0400
Subject: [PATCH 51/56] Removed potential cause of 'heap-use-after-free' error.

---
 editor/symbol_tooltip.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index d33c88c161e9..6490ffdeb55f 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -106,7 +106,6 @@ SymbolTooltip::SymbolTooltip(CodeEdit *p_text_editor) :
 }
 
 SymbolTooltip::~SymbolTooltip() {
-	memdelete(tooltip_delay);
 }
 
 void SymbolTooltip::_notification(int p_what) {

From 9597367176571492e8b59cec7381e2b9b6a0afb4 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Wed, 13 Sep 2023 22:03:32 -0400
Subject: [PATCH 52/56] Enabled 'Copy' and 'Select All' context menu items on
 the tooltip body.

---
 editor/symbol_tooltip.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 6490ffdeb55f..a6e6dd6322e1 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -87,6 +87,8 @@ SymbolTooltip::SymbolTooltip(CodeEdit *p_text_editor) :
 	body_label->set_focus_mode(Control::FOCUS_ALL);
 	//body_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	body_label->set_theme(_create_body_label_theme());
+	body_label->set_mouse_filter(Control::MOUSE_FILTER_STOP);
+	body_label->set_context_menu_enabled(true);
 	//body_label->set_fit_content(true); // WARNING!! - Enabling this will cause issues in _update_tooltip_size().
 	body_label->hide();
 	layout_container->add_child(body_label);

From 0c32564e8fa7272220a4d675b09e9c8b6015b2b3 Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 29 Sep 2023 01:52:53 -0400
Subject: [PATCH 53/56] Added the ability to compare Position variables and to
 check if one Range is within another.

---
 modules/gdscript/language_server/godot_lsp.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/gdscript/language_server/godot_lsp.h b/modules/gdscript/language_server/godot_lsp.h
index 98b53a6e6d18..db246059f0f4 100644
--- a/modules/gdscript/language_server/godot_lsp.h
+++ b/modules/gdscript/language_server/godot_lsp.h
@@ -83,6 +83,18 @@ struct Position {
 	 */
 	int character = 0;
 
+	_FORCE_INLINE_ bool operator >= (const Position& other) const {
+		if (line > other.line) return true;
+		if (line == other.line && character >= other.character) return true;
+		return false;
+	}
+
+	_FORCE_INLINE_ bool operator <= (const Position& other) const {
+		if (line < other.line) return true;
+		if (line == other.line && character <= other.character) return true;
+		return false;
+	}
+
 	_FORCE_INLINE_ void load(const Dictionary &p_params) {
 		line = p_params["line"];
 		character = p_params["character"];
@@ -112,6 +124,10 @@ struct Range {
 	 */
 	Position end;
 
+	_FORCE_INLINE_ bool is_within(const Range& other) const {
+		return start >= other.start && end <= other.end;
+	}
+
 	_FORCE_INLINE_ void load(const Dictionary &p_params) {
 		start.load(p_params["start"]);
 		end.load(p_params["end"]);

From 0bda6e400528e05fc754f2d3d60207ec39819abb Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Fri, 29 Sep 2023 02:00:47 -0400
Subject: [PATCH 54/56] Sizeable refactor.

---
 editor/symbol_tooltip.cpp | 195 ++++++++++++++++++++++++--------------
 editor/symbol_tooltip.h   |  26 ++---
 2 files changed, 136 insertions(+), 85 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index a6e6dd6322e1..063e2586d4f0 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -115,10 +115,10 @@ void SymbolTooltip::_notification(int p_what) {
 		case NOTIFICATION_PROCESS: {
 			// Note: Child components prevent NOTIFICATION_MOUSE_ENTER and NOTIFICATION_MOUSE_EXIT from working properly.
 			// Get the local mouse position
-			Vector2 local_mouse_position = get_global_mouse_position() - get_global_position();
+			Point2i local_mouse_position = get_global_mouse_position() - get_global_position();
 
 			// Check if it's within the rect of the PanelContainer
-			Rect2 tooltip_rect = Rect2(Vector2(0, 0), get_size());
+			Rect2 tooltip_rect = Rect2(Point2i(0, 0), get_size());
 			if (tooltip_rect.has_point(local_mouse_position)) {
 				if (is_visible() && !mouse_inside) {
 					// Mouse just entered
@@ -148,38 +148,39 @@ void SymbolTooltip::_close_tooltip() {
 	hide();
 }
 
-void SymbolTooltip::update_symbol_tooltip(const Vector2 &p_mouse_position, const Ref<Script> &p_script) {
-	String symbol_word = _get_symbol_word(p_mouse_position);
-	if (symbol_word.is_empty()) {
-		last_symbol_word = "";
+void SymbolTooltip::update_symbol_tooltip(const Point2i &p_mouse_pos, const Ref<Script> &p_script) {
+	String symbol = _get_symbol(p_mouse_pos);
+	if (symbol.is_empty()) {
+		last_symbol = "";
 		_close_tooltip();
 		return;
 	}
 
-	if (symbol_word == last_symbol_word && is_visible()) { // Symbol has not changed.
+	if (symbol == last_symbol && is_visible()) { // Symbol has not changed.
 		return;
 	} else {
 		// Symbol has changed, reset the timer.
 		_close_tooltip();
-		last_symbol_word = symbol_word;
+		last_symbol = symbol;
 	}
 
-	if (!_update_tooltip_content(p_script, symbol_word)) {
+	lsp::Range symbol_range;
+	if (!_try_get_symbol_range_at_pos(symbol,p_mouse_pos, symbol_range)) {
+		_close_tooltip();
+		return;
+	}
+
+	if (!_update_tooltip_content(p_script, symbol, symbol_range)) {
 		_close_tooltip();
 		return;
 	}
 	_update_tooltip_size();
 
 	Rect2 tooltip_rect = Rect2(get_position(), get_size());
-	bool mouse_over_tooltip = tooltip_rect.has_point(p_mouse_position) && is_visible();
+	bool mouse_over_tooltip = tooltip_rect.has_point(p_mouse_pos) && is_visible();
 	if (!mouse_over_tooltip) {
-		Vector2 tooltip_position = _calculate_tooltip_position(symbol_word, p_mouse_position);
-		if (tooltip_position == Vector2(-1, -1)) { // If position is invalid.
-			_close_tooltip();
-			return;
-		} else {
-			set_position(tooltip_position);
-		}
+		Point2i tooltip_pos = _calculate_tooltip_position(symbol_range);
+		set_position(tooltip_pos);
 	}
 
 	// Start the timer to show the tooltip after a delay.
@@ -188,12 +189,12 @@ void SymbolTooltip::update_symbol_tooltip(const Vector2 &p_mouse_position, const
 	}
 }
 
-String SymbolTooltip::_get_symbol_word(const Vector2 &p_mouse_position) {
+String SymbolTooltip::_get_symbol(const Point2i &p_mouse_pos) {
 	// Get the word under the mouse cursor.
-	return text_editor->get_word_at_pos(p_mouse_position);
+	return text_editor->get_word_at_pos(p_mouse_pos);
 }
 
-bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word) {
+bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol, const lsp::Range &p_symbol_range) {
 	// Update the tooltip's header and body.
 
 	bool is_built_in = false;
@@ -201,7 +202,7 @@ bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 	String built_in_body = "";
 	Vector<const DocData::ClassDoc *> class_docs = _get_built_in_class_docs();
 	for (const DocData::ClassDoc *class_doc : class_docs) {
-		const DocData::ConstantDoc *constant_doc = _get_class_constant_doc(class_doc, p_symbol_word);
+		const DocData::ConstantDoc *constant_doc = _get_class_constant_doc(class_doc, p_symbol);
 		if (constant_doc) {
 			built_in_header = constant_doc->name + " = " + constant_doc->value;
 			if (!constant_doc->enumeration.is_empty()) {
@@ -211,7 +212,7 @@ bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 			is_built_in = true;
 			break;
 		} else {
-			const DocData::MethodDoc *method_doc = _get_class_method_doc(class_doc, p_symbol_word);
+			const DocData::MethodDoc *method_doc = _get_class_method_doc(class_doc, p_symbol);
 			if (method_doc) {
 				built_in_header = _get_class_method_doc_definition(method_doc);
 				built_in_body = method_doc->description.strip_edges();
@@ -221,11 +222,12 @@ bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 		}
 	}
 
-	// String official_documentation = _get_doc_of_word(p_symbol_word);
+	// String official_documentation = _get_doc_of_word(p_symbol);
+	// ScriptLanguage::LookupResult symbol_info = _lookup_symbol(p_script, p_symbol);
+	//ExtendGDScriptParser *parser = _get_script_parser(p_script);
+	//const lsp::DocumentSymbol *member_symbol = parser->get_member_symbol(p_symbol);
 
-	ExtendGDScriptParser *parser = _get_script_parser(p_script);
-	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
-	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(members, p_symbol_word);
+	const lsp::DocumentSymbol *member_symbol = _get_member_symbol(p_script, p_symbol, p_symbol_range);
 
 	if (member_symbol == nullptr && !is_built_in) { // Symbol is not a member of the script.
 		return false;
@@ -233,7 +235,7 @@ bool SymbolTooltip::_update_tooltip_content(const Ref<Script> &p_script, const S
 
 	// TODO: Improve header content. Add the ability to see documentation comments or official documentation.
 	// Add constant value to the header content. e.g. "PI" becomes "PI = 3.141592653589793" (similar to how we do with ENUMs)
-	String header_content = _get_header_content(p_symbol_word, member_symbol, built_in_header);
+	String header_content = _get_header_content(p_symbol, member_symbol, built_in_header);
 	String body_content = _get_body_content(member_symbol, built_in_body);
 
 	_update_header_label(header_content);
@@ -269,23 +271,12 @@ void SymbolTooltip::_update_tooltip_size() {
 	// Set sizes
 	header_label->set_custom_minimum_size(Size2(tooltip_width, -1)); // TODO: Calculate this accurately instead of using -1.
 	body_label->set_custom_minimum_size(Size2(tooltip_width, MIN(body_label->get_content_height() + body_v_padding, 400)));
-	set_size(Vector2(tooltip_width, -1));
+	set_size(Size2(tooltip_width, -1));
 }
 
-Vector2 SymbolTooltip::_calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position) {
-	Vector2 line_col = text_editor->get_line_column_at_pos(p_mouse_position);
-	int row = line_col.y;
-	int col = line_col.x;
-	int num_lines = text_editor->get_line_count();
-	if (row >= 0 && row < num_lines) {
-		String line = text_editor->get_line(row);
-		int symbol_col = _get_word_pos_under_mouse(p_symbol_word, line, col);
-		if (symbol_col >= 0) {
-			Vector2 symbol_position = text_editor->get_pos_at_line_column(row, symbol_col);
-			return text_editor->get_global_position() + symbol_position;
-		}
-	}
-	return Vector2(-1, -1); // Indicates an invalid position.
+Point2i SymbolTooltip::_calculate_tooltip_position(const lsp::Range &p_symbol_range) {
+	Point2i symbol_position = text_editor->get_pos_at_line_column(p_symbol_range.start.line, p_symbol_range.start.character);
+	return text_editor->get_global_position() + symbol_position;
 }
 
 Vector<const DocData::ClassDoc *> SymbolTooltip::_get_built_in_class_docs() {
@@ -309,15 +300,31 @@ ExtendGDScriptParser *SymbolTooltip::_get_script_parser(const Ref<Script> &p_scr
 	return parser;
 }
 
+/*ScriptLanguage::LookupResult SymbolTooltip::_lookup_symbol(const Ref<Script> &p_script, const String &p_symbol) {
+	Node *base = get_tree()->get_edited_scene_root();
+	if (base) {
+		base = _find_node_for_script(base, base, p_script);
+	}
+
+	ScriptLanguage::LookupResult result;
+	String lc_text = text_editor->get_text_for_symbol_lookup();
+	Error lc_error = p_script->get_language()->lookup_code(lc_text, p_symbol, p_script->get_path(), base, result);
+	return result;
+}*/
+
 // TODO: Need to find the correct symbol instance instead of just the first match.
 const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
-		HashMap<String, const lsp::DocumentSymbol *> &p_members,
-		const String &p_symbol_word) { // , const Vector2 &symbol_position) {
+		const Ref<Script> &p_script,
+		const String &p_symbol,
+		const lsp::Range &p_symbol_range) {
+	ExtendGDScriptParser *parser = _get_script_parser(p_script);
+	HashMap<String, const lsp::DocumentSymbol *> members = parser->get_members();
+
 	// Use a queue to implement breadth-first search.
 	std::queue<const lsp::DocumentSymbol *> queue;
 
 	// Add all members to the queue.
-	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : p_members) {
+	for (const KeyValue<String, const lsp::DocumentSymbol *> &E : members) {
 		queue.push(E.value);
 	}
 
@@ -327,8 +334,16 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		const lsp::DocumentSymbol *symbol = queue.front();
 		queue.pop();
 
+		/*bool range_matches = symbol->range.to_json() == p_symbol_range.to_json();
+		bool is_within_range = p_symbol_range.is_within(symbol->range);
+
+		if (symbol->name == p_symbol && !symbol->detail.is_empty()) {
+			print_line("symbol: ", symbol->name, ", range_matches: ", range_matches, ", is_within_range: ", is_within_range, ", range: ", symbol->range.to_json(), ", symbol_range: ", p_symbol_range.to_json());
+		}*/
+
 		// If the name matches, return the symbol.
-		if (symbol->name == p_symbol_word && !symbol->detail.is_empty()) { // && symbol->range.is_point_inside(symbol_position)) {
+		// TODO: Add '&& is_within_range' once the range of member symbols is corrected. They are currently incorrect.
+		if (symbol->name == p_symbol && !symbol->detail.is_empty()) {
 			return symbol;
 		}
 
@@ -341,22 +356,22 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 	return nullptr; // If the symbol is not found, return nullptr.
 }
 
-const DocData::MethodDoc *SymbolTooltip::_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word) {
+const DocData::MethodDoc *SymbolTooltip::_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol) {
 	for (int i = 0; i < p_class_doc->methods.size(); ++i) {
 		const DocData::MethodDoc &method_doc = p_class_doc->methods[i];
 
-		if (method_doc.name == p_symbol_word) {
+		if (method_doc.name == p_symbol) {
 			return &method_doc;
 		}
 	}
 	return nullptr;
 }
 
-const DocData::ConstantDoc *SymbolTooltip::_get_class_constant_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word) {
+const DocData::ConstantDoc *SymbolTooltip::_get_class_constant_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol) {
 	for (int i = 0; i < p_class_doc->constants.size(); ++i) {
 		const DocData::ConstantDoc &constant_doc = p_class_doc->constants[i];
 
-		if (constant_doc.name == p_symbol_word) {
+		if (constant_doc.name == p_symbol) {
 			if (constant_doc.is_value_valid) {
 				return &constant_doc;
 			}
@@ -390,14 +405,14 @@ String SymbolTooltip::_get_class_method_doc_definition(const DocData::MethodDoc
 	return definition;
 }
 
-String SymbolTooltip::_get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, String p_built_in_header) {
+String SymbolTooltip::_get_header_content(const String &p_symbol, const lsp::DocumentSymbol *p_member_symbol, String p_built_in_header) {
 	if (p_member_symbol && !p_member_symbol->reduced_detail.is_empty()) {
 		return p_member_symbol->reduced_detail;
 	}
 	if (!p_built_in_header.is_empty()) {
 		return p_built_in_header;
 	}
-	return p_symbol_word;
+	return p_symbol;
 }
 
 String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_built_in_body) {
@@ -433,33 +448,67 @@ void SymbolTooltip::_update_body_label(const String &p_body_content) {
 	}
 }
 
-int SymbolTooltip::_get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const {
-	// Created this because _get_column_pos_of_word() only gets the column position of the first occurrence of the word in the line.
+bool SymbolTooltip::_is_valid_line(const String &p_line) const {
+	// Check if the line is empty or only contains whitespace.
+	if (p_line.is_empty() || p_line.strip_edges().is_empty()) {
+		return false;
+	}
 
-	// Early exit if the symbol word is empty, the search string is empty, or the mouse is outside the string.
-	if (p_symbol_word.is_empty() || p_search.is_empty() || p_mouse_x < 0 || p_mouse_x >= p_search.length()) {
-		return -1;
+	// Check if the line is a comment.
+	if (p_line.begins_with("#")) {
+		return false;
+	}
+
+	// Check if the line is a docstring. TODO: Need a better way to detect docstrings.
+	if (p_line.begins_with("\"\"\"") || p_line.begins_with("'''")) {
+		return false;
 	}
 
-	int start = p_mouse_x;
-	int end = p_mouse_x;
+	return true;
+}
+
+bool SymbolTooltip::_try_get_symbol_range_at_pos(const String &p_symbol, const Point2i &p_pos, lsp::Range &r_symbol_range) const {
+	Point2i line_column = text_editor->get_line_column_at_pos(p_pos, false);
+	int row = line_column.y;
+	int column = line_column.x;
+	if (line_column == Point2i(-1, -1)) { // If the position is outside the text editor.
+		return false;
+	}
+
+	String line = text_editor->get_line(row);
+	if(!_is_valid_line(line)) {
+		return false;
+	}
+
+	bool is_outside_line = column < 0 || column >= line.length();
+	// Invalid if the symbol word is empty or if the column is outside of the line.
+	if (p_symbol.is_empty() || is_outside_line) {
+		return false;
+	}
+
+	int start = column;
+	int end = column;
 
 	// Extend the start and end until they reach the beginning or end of the word.
-	while (start > 0 && is_ascii_identifier_char(p_search[start - 1])) {
+	while (start > 0 && is_ascii_identifier_char(line[start - 1])) {
 		start--;
 	}
-	while (end < p_search.length() && is_ascii_identifier_char(p_search[end])) {
+	while (end < line.length() && is_ascii_identifier_char(line[end])) {
 		end++;
 	}
 
-	String word_under_mouse = p_search.substr(start, end - start);
+	String word_under_mouse = line.substr(start, end - start);
 
-	// If the word under the mouse matches the symbol word, return the start position.
-	if (word_under_mouse == p_symbol_word) {
-		return start + 1; // Note: +1 is added to account for zero-based indexing.
+	// Invalid if the word under the mouse is not the symbol word.
+	if (word_under_mouse != p_symbol) {
+		return false;
 	}
 
-	return -1; // Return -1 if no match is found.
+	r_symbol_range = {
+		{ row, start + 1 }, // Note: +1 is added to account for zero-based indexing.
+		{ row, end }
+	};
+	return true;
 }
 
 Ref<Theme> SymbolTooltip::_create_panel_theme() {
@@ -507,15 +556,15 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 	return theme;
 }
 
-/*const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &p_symbol_word) {
+/*const GDScriptParser::ClassNode::Member *find_symbol(const GDScriptParser::ClassNode *node, const String &p_symbol) {
 	for (int i = 0; i < node->members.size(); ++i) {
 		const GDScriptParser::ClassNode::Member &member = node->members[i];
 
-		if (member.get_name() == p_symbol_word) {
+		if (member.get_name() == p_symbol) {
 			// Found the symbol.
 			return &member;
 		} else if (member.type == GDScriptParser::ClassNode::Member::CLASS) {
-			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, p_symbol_word);
+			const GDScriptParser::ClassNode::Member *found_symbol = find_symbol(member.m_class, p_symbol);
 			if (found_symbol) {
 				return found_symbol;
 			}
@@ -525,14 +574,14 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 	return nullptr;
 }*/
 
-/*String SymbolTooltip::_get_doc_of_word(const String &p_symbol_word) {
+/*String SymbolTooltip::_get_doc_of_word(const String &p_symbol) {
 	String documentation;
 
 	const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
 	for (const KeyValue<String, DocData::ClassDoc> &E : class_list) {
 		const DocData::ClassDoc &class_doc = E.value;
 
-		if (class_doc.name == p_symbol_word) {
+		if (class_doc.name == p_symbol) {
 			documentation = class_doc.brief_description.strip_edges(); //class_doc.brief_description + "\n\n" + class_doc.description;
 			if (documentation.is_empty()) {
 				documentation = class_doc.description.strip_edges();
@@ -543,7 +592,7 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 		for (int i = 0; i < class_doc.methods.size(); ++i) {
 			const DocData::MethodDoc &method_doc = class_doc.methods[i];
 
-			if (method_doc.name == p_symbol_word) {
+			if (method_doc.name == p_symbol) {
 				documentation = method_doc.description.strip_edges();
 				break;
 			}
@@ -552,7 +601,7 @@ Ref<Theme> SymbolTooltip::_create_body_label_theme() {
 		for (int i = 0; i < class_doc.constants.size(); ++i) {
 			const DocData::ConstantDoc &constant_doc = class_doc.constants[i];
 
-			if (constant_doc.name == p_symbol_word) {
+			if (constant_doc.name == p_symbol) {
 				if (constant_doc.is_value_valid) {
 					documentation = constant_doc.value.strip_edges();
 				}
diff --git a/editor/symbol_tooltip.h b/editor/symbol_tooltip.h
index aa5a32218718..7821d436cf31 100644
--- a/editor/symbol_tooltip.h
+++ b/editor/symbol_tooltip.h
@@ -47,37 +47,39 @@ class SymbolTooltip : public PanelContainer {
 	TextEdit *header_label = nullptr;
 	RichTextLabel *body_label = nullptr;
 	Timer *tooltip_delay = nullptr;
-	String last_symbol_word;
+	String last_symbol;
 	bool mouse_inside;
 
 	void _on_tooltip_delay_timeout();
 	void _close_tooltip();
-	String _get_symbol_word(const Vector2 &p_mouse_position);
-	bool _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol_word);
+	String _get_symbol(const Point2i &p_mouse_pos);
+	bool _update_tooltip_content(const Ref<Script> &p_script, const String &p_symbol, const lsp::Range &p_symbol_range);
 	void _update_tooltip_size();
-	Vector2 _calculate_tooltip_position(const String &p_symbol_word, const Vector2 &p_mouse_position);
+	Point2i _calculate_tooltip_position(const lsp::Range &p_symbol_range);
 	Vector<const DocData::ClassDoc *> _get_built_in_class_docs();
 	ExtendGDScriptParser *_get_script_parser(const Ref<Script> &p_script);
-	const lsp::DocumentSymbol *_get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
-	const DocData::MethodDoc *_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word);
-	const DocData::ConstantDoc *_get_class_constant_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol_word);
+	// ScriptLanguage::LookupResult _lookup_symbol(const Ref<Script> &p_script, const String &p_symbol);
+	const lsp::DocumentSymbol *_get_member_symbol(const Ref<Script> &p_script, const String &p_symbol, const lsp::Range &p_symbol_range);
+	const DocData::MethodDoc *_get_class_method_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol);
+	const DocData::ConstantDoc *_get_class_constant_doc(const DocData::ClassDoc *p_class_doc, const String &p_symbol);
 	String _get_class_method_doc_definition(const DocData::MethodDoc *p_method_doc);
-	String _get_header_content(const String &p_symbol_word, const lsp::DocumentSymbol *p_member_symbol, String p_built_in_header);
+	String _get_header_content(const String &p_symbol, const lsp::DocumentSymbol *p_member_symbol, String p_built_in_header);
 	String _get_body_content(const lsp::DocumentSymbol *p_member_symbol, String p_built_in_body);
 	void _update_header_label(const String &p_header_content);
 	void _update_body_label(const String &p_body_content);
-	int _get_word_pos_under_mouse(const String &p_symbol_word, const String &p_search, int p_mouse_x) const;
+	bool _is_valid_line(const String &p_line) const;
+	bool _try_get_symbol_range_at_pos(const String &p_symbol, const Point2i &p_pos, lsp::Range &r_symbol_range) const;
 	Ref<Theme> _create_panel_theme();
 	Ref<Theme> _create_header_label_theme();
 	Ref<Theme> _create_body_label_theme();
 
-	// String _get_doc_of_word(const String &p_symbol_word);
+	// String _get_doc_of_word(const String &p_symbol);
 
 protected:
 	void _notification(int p_what);
 
 public:
-	void update_symbol_tooltip(const Vector2 &p_mouse_position, const Ref<Script> &p_script);
+	void update_symbol_tooltip(const Point2i &p_mouse_pos, const Ref<Script> &p_script);
 	SymbolTooltip(CodeEdit *p_text_editor);
 	~SymbolTooltip();
 };
@@ -85,6 +87,6 @@ class SymbolTooltip : public PanelContainer {
 // static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script);
 // static const GDScriptParser::ClassNode *get_ast_tree(const Ref<Script> &p_script);
 // static ExtendGDScriptParser *get_script_parser(const Ref<Script> &p_script);
-// const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol_word);
+// const lsp::DocumentSymbol *get_member_symbol(HashMap<String, const lsp::DocumentSymbol *> &p_members, const String &p_symbol);
 
 #endif // SYMBOL_TOOLTIP_H

From 41559e0e342d110627152d7fb62f34b022951d2c Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sat, 30 Sep 2023 16:08:51 -0400
Subject: [PATCH 55/56] Post-merge adjustments.

---
 editor/symbol_tooltip.cpp                     | 12 ++--
 .../gdscript_extend_parser.cpp                | 63 ++++---------------
 2 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 063e2586d4f0..082c673293dd 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -31,6 +31,7 @@
 #include "symbol_tooltip.h"
 #include "core/config/project_settings.h"
 #include "editor/plugins/script_text_editor.h"
+#include "editor/editor_string_names.h"
 #include "editor_help.h"
 #include "modules/gdscript/editor/gdscript_highlighter.h"
 #include <queue>
@@ -248,8 +249,8 @@ void SymbolTooltip::_update_tooltip_size() {
 	const int MAX_WIDTH = 800;
 	Ref<Theme> header_theme = header_label->get_theme();
 	Ref<StyleBox> header_style_box = header_theme->get_stylebox("normal", "TextEdit");
-	Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Editor"));
-	int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Editor"));
+	Ref<Font> font = get_theme_font(SNAME("doc"), EditorStringName(EditorFonts));
+	int font_size = get_theme_font_size(SNAME("doc_size"), EditorStringName(EditorFonts));
 	String header_text = header_label->get_text();
 	String body_text = body_label->get_parsed_text();
 	Ref<Theme> body_theme = body_label->get_theme();
@@ -334,12 +335,12 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		const lsp::DocumentSymbol *symbol = queue.front();
 		queue.pop();
 
-		/*bool range_matches = symbol->range.to_json() == p_symbol_range.to_json();
+		bool range_matches = symbol->range.to_json() == p_symbol_range.to_json();
 		bool is_within_range = p_symbol_range.is_within(symbol->range);
 
 		if (symbol->name == p_symbol && !symbol->detail.is_empty()) {
 			print_line("symbol: ", symbol->name, ", range_matches: ", range_matches, ", is_within_range: ", is_within_range, ", range: ", symbol->range.to_json(), ", symbol_range: ", p_symbol_range.to_json());
-		}*/
+		}
 
 		// If the name matches, return the symbol.
 		// TODO: Add '&& is_within_range' once the range of member symbols is corrected. They are currently incorrect.
@@ -419,7 +420,8 @@ String SymbolTooltip::_get_body_content(const lsp::DocumentSymbol *p_member_symb
 	String body_content = "";
 	if (p_member_symbol) {
 		// Append relevant docstrings.
-		body_content += p_member_symbol->documentation.replace("\n ", " ");
+		// TODO: Docstring formatting currently has no built-in formatting for documentation comments.
+		body_content += p_member_symbol->documentation.replace("\n\n", "\n");
 	}
 	if (!p_built_in_body.is_empty()) {
 		// Append official documentation.
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 6493433e3f01..a57003361949 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -245,13 +245,15 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 	r_symbol.detail = "class " + r_symbol.name;
 	r_symbol.reduced_detail = r_symbol.detail;
 	{
-		String doc = p_class->doc_data.description;
+		String doc = "";
+		if (!p_class->doc_data.brief.is_empty()) {
+			doc += p_class->doc_data.brief + "\n";
+		}
 		if (!p_class->doc_data.description.is_empty()) {
-			doc += "\n\n" + p_class->doc_data.description;
+			doc += p_class->doc_data.description + "\n";
 		}
 
 		if (!p_class->doc_data.tutorials.is_empty()) {
-			doc += "\n";
 			for (const Pair<String, String> &tutorial : p_class->doc_data.tutorials) {
 				if (tutorial.first.is_empty()) {
 					doc += vformat("\n@tutorial: %s", tutorial.second);
@@ -392,25 +394,14 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 					if (param->get_datatype().is_hard_type()) {
 						param_symbol.detail += ": " + param->get_datatype().to_string();
 					}
+					param_symbol.reduced_detail = param_symbol.detail;
 					symbol.children.push_back(param_symbol);
 				}
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::ENUM_VALUE: {
 				lsp::DocumentSymbol symbol;
-
-				symbol.name = m.enum_value.identifier->name;
-				symbol.kind = lsp::SymbolKind::EnumMember;
-				symbol.deprecated = false;
-				symbol.range.start = GodotPosition(m.enum_value.line, m.enum_value.leftmost_column).to_lsp(this->lines);
-				symbol.range.end = GodotPosition(m.enum_value.line, m.enum_value.rightmost_column).to_lsp(this->lines);
-				symbol.selectionRange = range_of_node(m.enum_value.identifier);
-				symbol.documentation = m.enum_value.doc_data.description;
-				symbol.uri = uri;
-				symbol.script_path = path;
-
-				symbol.detail = symbol.name + " = " + itos(m.enum_value.value);
-
+				parse_enum_value_symbol(&m.enum_value, symbol);
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::ENUM: {
@@ -433,34 +424,10 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 
 					lsp::DocumentSymbol ev_symbol;
 					parse_enum_value_symbol(enum_value, ev_symbol);
-					r_symbol.children.push_back(ev_symbol);
+					symbol.children.push_back(ev_symbol);
 				}
 				symbol.detail += "}";
 				symbol.reduced_detail = "enum " + String(m.m_enum->identifier->name);
-
-				for (GDScriptParser::EnumNode::Value value : m.m_enum->values) {
-					lsp::DocumentSymbol child;
-
-					child.name = value.identifier->name;
-					child.kind = lsp::SymbolKind::EnumMember;
-					child.deprecated = false;
-					child.range.start = GodotPosition(value.line, value.leftmost_column).to_lsp(this->lines);
-					child.range.end = GodotPosition(value.line, value.rightmost_column).to_lsp(this->lines);
-					child.selectionRange = range_of_node(value.identifier);
-					child.documentation = value.doc_data.description;
-					child.uri = uri;
-					child.script_path = path;
-
-					child.detail = child.name + " = " + itos(value.value);
-
-					symbol.children.push_back(child);
-				}
-
-				r_symbol.children.push_back(symbol);
-			} break;
-			case ClassNode::Member::ENUM_VALUE: {
-				lsp::DocumentSymbol symbol;
-				parse_enum_value_symbol(&m.enum_value, symbol);
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::FUNCTION: {
@@ -482,18 +449,14 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 }
 
 void ExtendGDScriptParser::parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol &r_symbol) {
-	const String uri = get_uri();
-
 	r_symbol.name = p_value->identifier->name;
 	r_symbol.kind = lsp::SymbolKind::EnumMember;
 	r_symbol.deprecated = false;
-	r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_value->line);
-	r_symbol.range.start.character = LINE_NUMBER_TO_INDEX(p_value->leftmost_column);
-	r_symbol.range.end.line = LINE_NUMBER_TO_INDEX(p_value->line);
-	r_symbol.range.end.character = LINE_NUMBER_TO_INDEX(p_value->rightmost_column);
-	r_symbol.selectionRange.start.line = LINE_NUMBER_TO_INDEX(p_value->line);
-	r_symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(p_value->line));
-	r_symbol.uri = uri;
+	r_symbol.range.start = GodotPosition(p_value->line, p_value->leftmost_column).to_lsp(this->lines);
+	r_symbol.range.end = GodotPosition(p_value->line, p_value->rightmost_column).to_lsp(this->lines);
+	r_symbol.selectionRange = range_of_node(p_value->identifier);
+	r_symbol.documentation = p_value->doc_data.description;
+	r_symbol.uri = get_uri();
 	r_symbol.script_path = path;
 
 	if (p_value->parent_enum->identifier != nullptr) {

From 3ddd23b771497fcdb58c49eb306892f01779742c Mon Sep 17 00:00:00 2001
From: Justin McGettigan <jwmcgettigan@gmail.com>
Date: Sun, 1 Oct 2023 04:18:19 -0400
Subject: [PATCH 56/56] Updated all instances of DocumentSymbol to use pointers
 to allow the addition of a 'parent' pointer on each symbol.

---
 editor/symbol_tooltip.cpp                     |  13 +-
 .../gdscript_extend_parser.cpp                | 380 +++++++++---------
 .../language_server/gdscript_extend_parser.h  |  12 +-
 .../gdscript_text_document.cpp                |   8 +-
 .../language_server/gdscript_workspace.cpp    | 165 ++++----
 .../language_server/gdscript_workspace.h      |   8 +-
 modules/gdscript/language_server/godot_lsp.h  |   8 +-
 7 files changed, 313 insertions(+), 281 deletions(-)

diff --git a/editor/symbol_tooltip.cpp b/editor/symbol_tooltip.cpp
index 082c673293dd..2aa6735cce33 100644
--- a/editor/symbol_tooltip.cpp
+++ b/editor/symbol_tooltip.cpp
@@ -335,11 +335,16 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 		const lsp::DocumentSymbol *symbol = queue.front();
 		queue.pop();
 
-		bool range_matches = symbol->range.to_json() == p_symbol_range.to_json();
-		bool is_within_range = p_symbol_range.is_within(symbol->range);
+		bool is_within_range = p_symbol_range.is_within(symbol->parent->range);
 
 		if (symbol->name == p_symbol && !symbol->detail.is_empty()) {
-			print_line("symbol: ", symbol->name, ", range_matches: ", range_matches, ", is_within_range: ", is_within_range, ", range: ", symbol->range.to_json(), ", symbol_range: ", p_symbol_range.to_json());
+			print_line(
+				"symbol: ", symbol->name,
+				"parent: ", symbol->parent->name,
+				", is_within_range: ", is_within_range,
+				", parent_range: ", symbol->parent->range.to_json(),
+				", symbol_range: ", p_symbol_range.to_json()
+			);
 		}
 
 		// If the name matches, return the symbol.
@@ -350,7 +355,7 @@ const lsp::DocumentSymbol *SymbolTooltip::_get_member_symbol(
 
 		// Add the children to the queue for later processing.
 		for (int i = 0; i < symbol->children.size(); ++i) {
-			queue.push(&symbol->children[i]);
+			queue.push(symbol->children[i]);
 		}
 	}
 
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index a57003361949..cf36308adee0 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -171,18 +171,18 @@ void ExtendGDScriptParser::update_symbols() {
 	if (const GDScriptParser::ClassNode *gdclass = dynamic_cast<const GDScriptParser::ClassNode *>(get_tree())) {
 		parse_class_symbol(gdclass, class_symbol);
 
-		for (int i = 0; i < class_symbol.children.size(); i++) {
-			const lsp::DocumentSymbol &symbol = class_symbol.children[i];
-			members.insert(symbol.name, &symbol);
+		for (int i = 0; i < class_symbol->children.size(); i++) {
+			const lsp::DocumentSymbol *symbol = class_symbol->children[i];
+			members.insert(symbol->name, symbol);
 
 			// Cache level one inner classes.
-			if (symbol.kind == lsp::SymbolKind::Class) {
+			if (symbol->kind == lsp::SymbolKind::Class) {
 				ClassMembers inner_class;
-				for (int j = 0; j < symbol.children.size(); j++) {
-					const lsp::DocumentSymbol &s = symbol.children[j];
-					inner_class.insert(s.name, &s);
+				for (int j = 0; j < symbol->children.size(); j++) {
+					const lsp::DocumentSymbol *s = symbol->children[j];
+					inner_class.insert(s->name, s);
 				}
-				inner_classes.insert(symbol.name, inner_class);
+				inner_classes.insert(symbol->name, inner_class);
 			}
 		}
 	}
@@ -225,25 +225,25 @@ lsp::Range ExtendGDScriptParser::range_of_node(const GDScriptParser::Node *p_nod
 	return GodotRange(start, end).to_lsp(this->lines);
 }
 
-void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol &r_symbol) {
+void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol *r_symbol) {
 	const String uri = get_uri();
 
-	r_symbol.uri = uri;
-	r_symbol.script_path = path;
-	r_symbol.children.clear();
-	r_symbol.name = p_class->identifier != nullptr ? String(p_class->identifier->name) : String();
-	if (r_symbol.name.is_empty()) {
-		r_symbol.name = path.get_file();
+	r_symbol->uri = uri;
+	r_symbol->script_path = path;
+	r_symbol->children.clear();
+	r_symbol->name = p_class->identifier != nullptr ? String(p_class->identifier->name) : String();
+	if (r_symbol->name.is_empty()) {
+		r_symbol->name = path.get_file();
 	}
-	r_symbol.kind = lsp::SymbolKind::Class;
-	r_symbol.deprecated = false;
-	r_symbol.range = range_of_node(p_class);
-	r_symbol.range.start.line = MAX(r_symbol.range.start.line, 0);
+	r_symbol->kind = lsp::SymbolKind::Class;
+	r_symbol->deprecated = false;
+	r_symbol->range = range_of_node(p_class);
+	r_symbol->range.start.line = MAX(r_symbol->range.start.line, 0);
 	if (p_class->identifier) {
-		r_symbol.selectionRange = range_of_node(p_class->identifier);
+		r_symbol->selectionRange = range_of_node(p_class->identifier);
 	}
-	r_symbol.detail = "class " + r_symbol.name;
-	r_symbol.reduced_detail = r_symbol.detail;
+	r_symbol->detail = "class " + r_symbol->name;
+	r_symbol->reduced_detail = r_symbol->detail;
 	{
 		String doc = "";
 		if (!p_class->doc_data.brief.is_empty()) {
@@ -262,7 +262,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				}
 			}
 		}
-		r_symbol.documentation = doc;
+		r_symbol->documentation = doc;
 	}
 
 	for (int i = 0; i < p_class->members.size(); i++) {
@@ -270,68 +270,74 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 
 		switch (m.type) {
 			case ClassNode::Member::VARIABLE: {
-				lsp::DocumentSymbol symbol;
-				symbol.name = m.variable->identifier->name;
-				symbol.kind = m.variable->property == VariableNode::PROP_NONE ? lsp::SymbolKind::Variable : lsp::SymbolKind::Property;
-				symbol.deprecated = false;
-				symbol.range = range_of_node(m.variable);
-				symbol.selectionRange = range_of_node(m.variable->identifier);
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+				symbol->name = m.variable->identifier->name;
+				symbol->kind = m.variable->property == VariableNode::PROP_NONE ? lsp::SymbolKind::Variable : lsp::SymbolKind::Property;
+				symbol->deprecated = false;
+				symbol->range = range_of_node(m.variable);
+				symbol->selectionRange = range_of_node(m.variable->identifier);
 				if (m.variable->exported) {
-					symbol.detail += "@export ";
+					symbol->detail += "@export ";
 				}
-				symbol.detail += "var " + m.variable->identifier->name;
+				symbol->detail += "var " + m.variable->identifier->name;
 				if (m.get_datatype().is_hard_type()) {
-					symbol.detail += ": " + m.get_datatype().to_string();
+					symbol->detail += ": " + m.get_datatype().to_string();
 				}
-				symbol.reduced_detail = symbol.detail;
+				symbol->reduced_detail = symbol->detail;
 				if (m.variable->initializer != nullptr && m.variable->initializer->is_constant) {
-					symbol.detail += " = " + m.variable->initializer->reduced_value.to_json_string();
+					symbol->detail += " = " + m.variable->initializer->reduced_value.to_json_string();
 				}
 
-				symbol.documentation = m.variable->doc_data.description;
-				symbol.uri = uri;
-				symbol.script_path = path;
+				symbol->documentation = m.variable->doc_data.description;
+				symbol->uri = uri;
+				symbol->script_path = path;
 
 				if (m.variable->initializer && m.variable->initializer->type == GDScriptParser::Node::LAMBDA) {
 					GDScriptParser::LambdaNode *lambda_node = (GDScriptParser::LambdaNode *)m.variable->initializer;
-					lsp::DocumentSymbol lambda;
+					lsp::DocumentSymbol *lambda = memnew(lsp::DocumentSymbol);
 					parse_function_symbol(lambda_node->function, lambda);
 					// Merge lambda into current variable.
-					symbol.children.append_array(lambda.children);
+					for (lsp::DocumentSymbol *lambda_symbol : lambda->children) {
+						lambda_symbol->parent = symbol;
+						symbol->children.push_back(lambda_symbol);
+					}
 				}
 
 				if (m.variable->getter && m.variable->getter->type == GDScriptParser::Node::FUNCTION) {
-					lsp::DocumentSymbol get_symbol;
+					lsp::DocumentSymbol *get_symbol = memnew(lsp::DocumentSymbol);
 					parse_function_symbol(m.variable->getter, get_symbol);
-					get_symbol.local = true;
-					symbol.children.push_back(get_symbol);
+					get_symbol->local = true;
+					get_symbol->parent = symbol;
+					symbol->children.push_back(get_symbol);
 				}
 				if (m.variable->setter && m.variable->setter->type == GDScriptParser::Node::FUNCTION) {
-					lsp::DocumentSymbol set_symbol;
+					lsp::DocumentSymbol *set_symbol = memnew(lsp::DocumentSymbol);
 					parse_function_symbol(m.variable->setter, set_symbol);
-					set_symbol.local = true;
-					symbol.children.push_back(set_symbol);
+					set_symbol->local = true;
+					set_symbol->parent = symbol;
+					symbol->children.push_back(set_symbol);
 				}
 
-				r_symbol.children.push_back(symbol);
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::CONSTANT: {
-				lsp::DocumentSymbol symbol;
-
-				symbol.name = m.constant->identifier->name;
-				symbol.kind = lsp::SymbolKind::Constant;
-				symbol.deprecated = false;
-				symbol.range = range_of_node(m.constant);
-				symbol.selectionRange = range_of_node(m.constant->identifier);
-				symbol.documentation = m.constant->doc_data.description;
-				symbol.uri = uri;
-				symbol.script_path = path;
-
-				symbol.detail = "const " + symbol.name;
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+
+				symbol->name = m.constant->identifier->name;
+				symbol->kind = lsp::SymbolKind::Constant;
+				symbol->deprecated = false;
+				symbol->range = range_of_node(m.constant);
+				symbol->selectionRange = range_of_node(m.constant->identifier);
+				symbol->documentation = m.constant->doc_data.description;
+				symbol->uri = uri;
+				symbol->script_path = path;
+
+				symbol->detail = "const " + symbol->name;
 				if (m.constant->get_datatype().is_hard_type()) {
-					symbol.detail += ": " + m.constant->get_datatype().to_string();
+					symbol->detail += ": " + m.constant->get_datatype().to_string();
 				}
-				symbol.reduced_detail = symbol.detail;
+				symbol->reduced_detail = symbol->detail;
 
 				const Variant &default_value = m.constant->initializer->reduced_value;
 				String value_text;
@@ -339,9 +345,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 					Ref<Resource> res = default_value;
 					if (res.is_valid() && !res->get_path().is_empty()) {
 						value_text = "preload(\"" + res->get_path() + "\")";
-						if (symbol.documentation.is_empty()) {
+						if (symbol->documentation.is_empty()) {
 							if (HashMap<String, ExtendGDScriptParser *>::Iterator S = GDScriptLanguageProtocol::get_singleton()->get_workspace()->scripts.find(res->get_path())) {
-								symbol.documentation = S->value->class_symbol.documentation;
+								symbol->documentation = S->value->class_symbol->documentation;
 							}
 						}
 					} else {
@@ -351,94 +357,103 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 					value_text = default_value.to_json_string();
 				}
 				if (!value_text.is_empty()) {
-					symbol.detail += " = " + value_text;
+					symbol->detail += " = " + value_text;
 				}
 
-				r_symbol.children.push_back(symbol);
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::SIGNAL: {
-				lsp::DocumentSymbol symbol;
-				symbol.name = m.signal->identifier->name;
-				symbol.kind = lsp::SymbolKind::Event;
-				symbol.deprecated = false;
-				symbol.range = range_of_node(m.signal);
-				symbol.selectionRange = range_of_node(m.signal->identifier);
-				symbol.documentation = m.signal->doc_data.description;
-				symbol.uri = uri;
-				symbol.script_path = path;
-				symbol.detail = "signal " + String(m.signal->identifier->name) + "(";
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+				symbol->name = m.signal->identifier->name;
+				symbol->kind = lsp::SymbolKind::Event;
+				symbol->deprecated = false;
+				symbol->range = range_of_node(m.signal);
+				symbol->selectionRange = range_of_node(m.signal->identifier);
+				symbol->documentation = m.signal->doc_data.description;
+				symbol->uri = uri;
+				symbol->script_path = path;
+				symbol->detail = "signal " + String(m.signal->identifier->name) + "(";
 				for (int j = 0; j < m.signal->parameters.size(); j++) {
 					const ParameterNode *parameter = m.signal->parameters[j];
 					if (j > 0) {
-						symbol.detail += ", ";
+						symbol->detail += ", ";
 					}
-					symbol.detail += parameter->identifier->name;
+					symbol->detail += parameter->identifier->name;
 					if (parameter->get_datatype().is_hard_type()) {
-						symbol.detail += ": " + parameter->get_datatype().to_string();
+						symbol->detail += ": " + parameter->get_datatype().to_string();
 					}
 				}
-				symbol.detail += ")";
-				symbol.reduced_detail = symbol.detail;
+				symbol->detail += ")";
+				symbol->reduced_detail = symbol->detail;
 
 				for (GDScriptParser::ParameterNode *param : m.signal->parameters) {
-					lsp::DocumentSymbol param_symbol;
-					param_symbol.name = param->identifier->name;
-					param_symbol.kind = lsp::SymbolKind::Variable;
-					param_symbol.deprecated = false;
-					param_symbol.local = true;
-					param_symbol.range = range_of_node(param);
-					param_symbol.selectionRange = range_of_node(param->identifier);
-					param_symbol.uri = uri;
-					param_symbol.script_path = path;
-					param_symbol.detail = "var " + param_symbol.name;
+					lsp::DocumentSymbol *param_symbol = memnew(lsp::DocumentSymbol);
+					param_symbol->name = param->identifier->name;
+					param_symbol->kind = lsp::SymbolKind::Variable;
+					param_symbol->deprecated = false;
+					param_symbol->local = true;
+					param_symbol->range = range_of_node(param);
+					param_symbol->selectionRange = range_of_node(param->identifier);
+					param_symbol->uri = uri;
+					param_symbol->script_path = path;
+					param_symbol->detail = "var " + param_symbol->name;
 					if (param->get_datatype().is_hard_type()) {
-						param_symbol.detail += ": " + param->get_datatype().to_string();
+						param_symbol->detail += ": " + param->get_datatype().to_string();
 					}
-					param_symbol.reduced_detail = param_symbol.detail;
-					symbol.children.push_back(param_symbol);
+					param_symbol->reduced_detail = param_symbol->detail;
+					param_symbol->parent = symbol;
+					symbol->children.push_back(param_symbol);
 				}
-				r_symbol.children.push_back(symbol);
+
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::ENUM_VALUE: {
-				lsp::DocumentSymbol symbol;
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
 				parse_enum_value_symbol(&m.enum_value, symbol);
-				r_symbol.children.push_back(symbol);
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::ENUM: {
-				lsp::DocumentSymbol symbol;
-				symbol.name = m.m_enum->identifier->name;
-				symbol.kind = lsp::SymbolKind::Enum;
-				symbol.range = range_of_node(m.m_enum);
-				symbol.selectionRange = range_of_node(m.m_enum->identifier);
-				symbol.documentation = m.m_enum->doc_data.description;
-				symbol.uri = uri;
-				symbol.script_path = path;
-
-				symbol.detail = "enum " + String(m.m_enum->identifier->name) + "{";
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+				symbol->name = m.m_enum->identifier->name;
+				symbol->kind = lsp::SymbolKind::Enum;
+				symbol->range = range_of_node(m.m_enum);
+				symbol->selectionRange = range_of_node(m.m_enum->identifier);
+				symbol->documentation = m.m_enum->doc_data.description;
+				symbol->uri = uri;
+				symbol->script_path = path;
+
+				symbol->detail = "enum " + String(m.m_enum->identifier->name) + "{";
 				for (int j = 0; j < m.m_enum->values.size(); j++) {
 					if (j > 0) {
-						symbol.detail += ", ";
+						symbol->detail += ", ";
 					}
 					const EnumNode::Value *enum_value = &m.m_enum->values[j];
-					symbol.detail += String(enum_value->identifier->name) + " = " + itos(enum_value->value);
+					symbol->detail += String(enum_value->identifier->name) + " = " + itos(enum_value->value);
 
-					lsp::DocumentSymbol ev_symbol;
+					lsp::DocumentSymbol *ev_symbol = memnew(lsp::DocumentSymbol);
 					parse_enum_value_symbol(enum_value, ev_symbol);
-					symbol.children.push_back(ev_symbol);
+					ev_symbol->parent = symbol;
+					symbol->children.push_back(ev_symbol);
 				}
-				symbol.detail += "}";
-				symbol.reduced_detail = "enum " + String(m.m_enum->identifier->name);
-				r_symbol.children.push_back(symbol);
+				symbol->detail += "}";
+				symbol->reduced_detail = "enum " + String(m.m_enum->identifier->name);
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::FUNCTION: {
-				lsp::DocumentSymbol symbol;
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
 				parse_function_symbol(m.function, symbol);
-				r_symbol.children.push_back(symbol);
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::CLASS: {
-				lsp::DocumentSymbol symbol;
+				lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
 				parse_class_symbol(m.m_class, symbol);
-				r_symbol.children.push_back(symbol);
+				symbol->parent = r_symbol;
+				r_symbol->children.push_back(symbol);
 			} break;
 			case ClassNode::Member::GROUP:
 				break; // No-op, but silences warnings.
@@ -448,48 +463,49 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 	}
 }
 
-void ExtendGDScriptParser::parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol &r_symbol) {
-	r_symbol.name = p_value->identifier->name;
-	r_symbol.kind = lsp::SymbolKind::EnumMember;
-	r_symbol.deprecated = false;
-	r_symbol.range.start = GodotPosition(p_value->line, p_value->leftmost_column).to_lsp(this->lines);
-	r_symbol.range.end = GodotPosition(p_value->line, p_value->rightmost_column).to_lsp(this->lines);
-	r_symbol.selectionRange = range_of_node(p_value->identifier);
-	r_symbol.documentation = p_value->doc_data.description;
-	r_symbol.uri = get_uri();
-	r_symbol.script_path = path;
+void ExtendGDScriptParser::parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol *r_symbol) {
+	r_symbol->name = p_value->identifier->name;
+	r_symbol->kind = lsp::SymbolKind::EnumMember;
+	r_symbol->deprecated = false;
+	r_symbol->range.start = GodotPosition(p_value->line, p_value->leftmost_column).to_lsp(this->lines);
+	r_symbol->range.end = GodotPosition(p_value->line, p_value->rightmost_column).to_lsp(this->lines);
+	r_symbol->selectionRange = range_of_node(p_value->identifier);
+	r_symbol->documentation = p_value->doc_data.description;
+	r_symbol->uri = get_uri();
+	r_symbol->script_path = path;
 
 	if (p_value->parent_enum->identifier != nullptr) {
-		r_symbol.detail = String(p_value->parent_enum->identifier->name) + "." + r_symbol.name + " = " + itos(p_value->value);
+		r_symbol->detail = String(p_value->parent_enum->identifier->name) + "." + r_symbol->name + " = " + itos(p_value->value);
 	} else {
-		r_symbol.detail = r_symbol.name + " = " + itos(p_value->value);
+		r_symbol->detail = r_symbol->name + " = " + itos(p_value->value);
 	}
 
-	r_symbol.reduced_detail = r_symbol.detail;
+	r_symbol->reduced_detail = r_symbol->detail;
 }
 
-void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol) {
+
+void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol *r_symbol) {
 	const String uri = get_uri();
 
 	bool is_named = p_func->identifier != nullptr;
 
-	r_symbol.name = is_named ? p_func->identifier->name : "";
-	r_symbol.kind = (p_func->is_static || p_func->source_lambda != nullptr) ? lsp::SymbolKind::Function : lsp::SymbolKind::Method;
-	r_symbol.detail = "func";
+	r_symbol->name = is_named ? p_func->identifier->name : "";
+	r_symbol->kind = (p_func->is_static || p_func->source_lambda != nullptr) ? lsp::SymbolKind::Function : lsp::SymbolKind::Method;
+	r_symbol->detail = "func";
 	if (is_named) {
-		r_symbol.detail += " " + String(p_func->identifier->name);
+		r_symbol->detail += " " + String(p_func->identifier->name);
 	}
-	r_symbol.detail += "(";
-	r_symbol.deprecated = false;
-	r_symbol.range = range_of_node(p_func);
+	r_symbol->detail += "(";
+	r_symbol->deprecated = false;
+	r_symbol->range = range_of_node(p_func);
 	if (is_named) {
-		r_symbol.selectionRange = range_of_node(p_func->identifier);
+		r_symbol->selectionRange = range_of_node(p_func->identifier);
 	} else {
-		r_symbol.selectionRange.start = r_symbol.selectionRange.end = r_symbol.range.start;
+		r_symbol->selectionRange.start = r_symbol->selectionRange.end = r_symbol->range.start;
 	}
-	r_symbol.documentation = p_func->doc_data.description;
-	r_symbol.uri = uri;
-	r_symbol.script_path = path;
+	r_symbol->documentation = p_func->doc_data.description;
+	r_symbol->uri = uri;
+	r_symbol->script_path = path;
 
 	String parameters;
 	for (int i = 0; i < p_func->parameters.size(); i++) {
@@ -505,13 +521,13 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 			parameters += " = " + parameter->initializer->reduced_value.to_json_string();
 		}
 	}
-	r_symbol.detail += parameters + ")";
-	r_symbol.reduced_detail = r_symbol.detail;
+	r_symbol->detail += parameters + ")";
+	r_symbol->reduced_detail = r_symbol->detail;
 	if (p_func->get_datatype().is_hard_type()) {
-		r_symbol.detail += " -> " + p_func->get_datatype().to_string();
+		r_symbol->detail += " -> " + p_func->get_datatype().to_string();
 
-		String return_type = r_symbol.name == "_init" ? "void" : p_func->get_datatype().to_string();
-		r_symbol.reduced_detail += " -> " + return_type;
+		String return_type = r_symbol->name == "_init" ? "void" : p_func->get_datatype().to_string();
+		r_symbol->reduced_detail += " -> " + return_type;
 	}
 
 	List<GDScriptParser::SuiteNode *> function_nodes;
@@ -571,62 +587,66 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 		const GDScriptParser::SuiteNode *suite_node = N->get();
 		for (int i = 0; i < suite_node->locals.size(); i++) {
 			const SuiteNode::Local &local = suite_node->locals[i];
-			lsp::DocumentSymbol symbol;
-			symbol.name = local.name;
-			symbol.kind = local.type == SuiteNode::Local::CONSTANT ? lsp::SymbolKind::Constant : lsp::SymbolKind::Variable;
+			lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+			symbol->name = local.name;
+			symbol->kind = local.type == SuiteNode::Local::CONSTANT ? lsp::SymbolKind::Constant : lsp::SymbolKind::Variable;
 			switch (local.type) {
 				case SuiteNode::Local::CONSTANT:
-					symbol.range = range_of_node(local.constant);
-					symbol.selectionRange = range_of_node(local.constant->identifier);
+					symbol->range = range_of_node(local.constant);
+					symbol->selectionRange = range_of_node(local.constant->identifier);
 					break;
 				case SuiteNode::Local::VARIABLE:
-					symbol.range = range_of_node(local.variable);
-					symbol.selectionRange = range_of_node(local.variable->identifier);
+					symbol->range = range_of_node(local.variable);
+					symbol->selectionRange = range_of_node(local.variable->identifier);
 					if (local.variable->initializer && local.variable->initializer->type == GDScriptParser::Node::LAMBDA) {
 						GDScriptParser::LambdaNode *lambda_node = (GDScriptParser::LambdaNode *)local.variable->initializer;
-						lsp::DocumentSymbol lambda;
+						lsp::DocumentSymbol *lambda = memnew(lsp::DocumentSymbol);
 						parse_function_symbol(lambda_node->function, lambda);
 						// Merge lambda into current variable.
 						// -> Only interested in new variables, not lambda itself.
-						symbol.children.append_array(lambda.children);
+						for (lsp::DocumentSymbol *lambda_symbol : lambda->children) {
+							lambda_symbol->parent = symbol;
+							symbol->children.push_back(lambda_symbol);
+						}
 					}
 					break;
 				case SuiteNode::Local::PARAMETER:
-					symbol.range = range_of_node(local.parameter);
-					symbol.selectionRange = range_of_node(local.parameter->identifier);
+					symbol->range = range_of_node(local.parameter);
+					symbol->selectionRange = range_of_node(local.parameter->identifier);
 					break;
 				case SuiteNode::Local::FOR_VARIABLE:
 				case SuiteNode::Local::PATTERN_BIND:
-					symbol.range = range_of_node(local.bind);
-					symbol.selectionRange = range_of_node(local.bind);
+					symbol->range = range_of_node(local.bind);
+					symbol->selectionRange = range_of_node(local.bind);
 					break;
 				default:
 					// Fallback.
-					symbol.range.start = GodotPosition(local.start_line, local.start_column).to_lsp(get_lines());
-					symbol.range.end = GodotPosition(local.end_line, local.end_column).to_lsp(get_lines());
-					symbol.selectionRange = symbol.range;
+					symbol->range.start = GodotPosition(local.start_line, local.start_column).to_lsp(get_lines());
+					symbol->range.end = GodotPosition(local.end_line, local.end_column).to_lsp(get_lines());
+					symbol->selectionRange = symbol->range;
 					break;
 			}
-			symbol.local = true;
-			symbol.uri = uri;
-			symbol.script_path = path;
-			symbol.detail = local.type == SuiteNode::Local::CONSTANT ? "const " : "var ";
-			symbol.detail += symbol.name;
+			symbol->local = true;
+			symbol->uri = uri;
+			symbol->script_path = path;
+			symbol->detail = local.type == SuiteNode::Local::CONSTANT ? "const " : "var ";
+			symbol->detail += symbol->name;
 			if (local.get_datatype().is_hard_type()) {
-				symbol.detail += ": " + local.get_datatype().to_string();
+				symbol->detail += ": " + local.get_datatype().to_string();
 			}
-			symbol.reduced_detail = symbol.detail;
+			symbol->reduced_detail = symbol->detail;
 			switch (local.type) {
 				case SuiteNode::Local::CONSTANT:
-					symbol.documentation = local.constant->doc_data.description;
+					symbol->documentation = local.constant->doc_data.description;
 					break;
 				case SuiteNode::Local::VARIABLE:
-					symbol.documentation = local.variable->doc_data.description;
+					symbol->documentation = local.variable->doc_data.description;
 					break;
 				default:
 					break;
 			}
-			r_symbol.children.push_back(symbol);
+			symbol->parent = r_symbol;
+			r_symbol->children.push_back(symbol);
 		}
 	}
 }
@@ -755,15 +775,15 @@ String ExtendGDScriptParser::get_uri() const {
 	return GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_uri(path);
 }
 
-const lsp::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol &p_parent, const String &p_symbol_name) const {
+const lsp::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol *p_parent, const String &p_symbol_name) const {
 	const lsp::DocumentSymbol *ret = nullptr;
-	if (p_line < p_parent.range.start.line) {
+	if (p_line < p_parent->range.start.line) {
 		return ret;
-	} else if (p_parent.range.start.line == p_line && (p_symbol_name.is_empty() || p_parent.name == p_symbol_name)) {
-		return &p_parent;
+	} else if (p_parent->range.start.line == p_line && (p_symbol_name.is_empty() || p_parent->name == p_symbol_name)) {
+		return p_parent;
 	} else {
-		for (int i = 0; i < p_parent.children.size(); i++) {
-			ret = search_symbol_defined_at_line(p_line, p_parent.children[i], p_symbol_name);
+		for (int i = 0; i < p_parent->children.size(); i++) {
+			ret = search_symbol_defined_at_line(p_line, p_parent->children[i], p_symbol_name);
 			if (ret) {
 				break;
 			}
@@ -818,7 +838,7 @@ Error ExtendGDScriptParser::get_left_function_call(const lsp::Position &p_positi
 
 const lsp::DocumentSymbol *ExtendGDScriptParser::get_symbol_defined_at_line(int p_line, const String &p_symbol_name) const {
 	if (p_line <= 0) {
-		return &class_symbol;
+		return class_symbol;
 	}
 	return search_symbol_defined_at_line(p_line, class_symbol, p_symbol_name);
 }
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.h b/modules/gdscript/language_server/gdscript_extend_parser.h
index 3d4bed7c4ea0..3a74f4e4b750 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.h
+++ b/modules/gdscript/language_server/gdscript_extend_parser.h
@@ -115,7 +115,7 @@ class ExtendGDScriptParser : public GDScriptParser {
 	String path;
 	Vector<String> lines;
 
-	lsp::DocumentSymbol class_symbol;
+	lsp::DocumentSymbol *class_symbol = memnew(lsp::DocumentSymbol);
 	Vector<lsp::Diagnostic> diagnostics;
 	List<lsp::DocumentLink> document_links;
 	ClassMembers members;
@@ -127,21 +127,21 @@ class ExtendGDScriptParser : public GDScriptParser {
 
 	void update_symbols();
 	void update_document_links(const String &p_code);
-	void parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol &r_symbol);
-	void parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol &r_symbol);
-	void parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol);
+	void parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol *r_symbol);
+	void parse_enum_value_symbol(const GDScriptParser::EnumNode::Value *p_value, lsp::DocumentSymbol *r_symbol);
+	void parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol *r_symbol);
 
 	Dictionary dump_function_api(const GDScriptParser::FunctionNode *p_func) const;
 	Dictionary dump_class_api(const GDScriptParser::ClassNode *p_class) const;
 
-	const lsp::DocumentSymbol *search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol &p_parent, const String &p_symbol_name = "") const;
+	const lsp::DocumentSymbol *search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol *p_parent, const String &p_symbol_name = "") const;
 
 	Array member_completions;
 
 public:
 	_FORCE_INLINE_ const String &get_path() const { return path; }
 	_FORCE_INLINE_ const Vector<String> &get_lines() const { return lines; }
-	_FORCE_INLINE_ const lsp::DocumentSymbol &get_symbols() const { return class_symbol; }
+	_FORCE_INLINE_ const lsp::DocumentSymbol *get_symbols() const { return class_symbol; }
 	_FORCE_INLINE_ const Vector<lsp::Diagnostic> &get_diagnostics() const { return diagnostics; }
 	_FORCE_INLINE_ const ClassMembers &get_members() const { return members; }
 	_FORCE_INLINE_ const HashMap<String, ClassMembers> &get_inner_classes() const { return inner_classes; }
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp
index d6779dc71c6e..1b5575fc68a3 100644
--- a/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -163,8 +163,8 @@ Array GDScriptTextDocument::documentSymbol(const Dictionary &p_params) {
 	String path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(uri);
 	Array arr;
 	if (HashMap<String, ExtendGDScriptParser *>::ConstIterator parser = GDScriptLanguageProtocol::get_singleton()->get_workspace()->scripts.find(path)) {
-		lsp::DocumentSymbol symbol = parser->value->get_symbols();
-		arr.push_back(symbol.to_json(true));
+		const lsp::DocumentSymbol *symbol = parser->value->get_symbols();
+		arr.push_back(symbol->to_json(true));
 	}
 	return arr;
 }
@@ -256,7 +256,7 @@ Variant GDScriptTextDocument::prepareRename(const Dictionary &p_params) {
 	lsp::TextDocumentPositionParams params;
 	params.load(p_params);
 
-	lsp::DocumentSymbol symbol;
+	lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
 	lsp::Range range;
 	if (GDScriptLanguageProtocol::get_singleton()->get_workspace()->can_rename(params, symbol, range)) {
 		return Variant(range.to_json());
@@ -274,7 +274,7 @@ Array GDScriptTextDocument::references(const Dictionary &p_params) {
 
 	const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
 	if (symbol) {
-		Vector<lsp::Location> usages = GDScriptLanguageProtocol::get_singleton()->get_workspace()->find_all_usages(*symbol);
+		Vector<lsp::Location> usages = GDScriptLanguageProtocol::get_singleton()->get_workspace()->find_all_usages(symbol);
 		res.resize(usages.size());
 		int declaration_adjustment = 0;
 		for (int i = 0; i < usages.size(); i++) {
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index 81933c8c87a7..32165dcd0c9c 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -142,16 +142,16 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_
 	StringName empty;
 
 	while (class_name != empty) {
-		if (HashMap<StringName, lsp::DocumentSymbol>::ConstIterator E = native_symbols.find(class_name)) {
-			const lsp::DocumentSymbol &class_symbol = E->value;
+		if (HashMap<StringName, lsp::DocumentSymbol *>::ConstIterator E = native_symbols.find(class_name)) {
+			const lsp::DocumentSymbol *class_symbol = E->value;
 
 			if (p_member.is_empty()) {
-				return &class_symbol;
+				return class_symbol;
 			} else {
-				for (int i = 0; i < class_symbol.children.size(); i++) {
-					const lsp::DocumentSymbol &symbol = class_symbol.children[i];
-					if (symbol.name == p_member) {
-						return &symbol;
+				for (int i = 0; i < class_symbol->children.size(); i++) {
+					const lsp::DocumentSymbol *symbol = class_symbol->children[i];
+					if (symbol->name == p_member) {
+						return symbol;
 					}
 				}
 			}
@@ -165,14 +165,14 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_
 const lsp::DocumentSymbol *GDScriptWorkspace::get_script_symbol(const String &p_path) const {
 	HashMap<String, ExtendGDScriptParser *>::ConstIterator S = scripts.find(p_path);
 	if (S) {
-		return &(S->value->get_symbols());
+		return S->value->get_symbols();
 	}
 	return nullptr;
 }
 
 const lsp::DocumentSymbol *GDScriptWorkspace::get_parameter_symbol(const lsp::DocumentSymbol *p_parent, const String &symbol_identifier) {
 	for (int i = 0; i < p_parent->children.size(); ++i) {
-		const lsp::DocumentSymbol *parameter_symbol = &p_parent->children[i];
+		const lsp::DocumentSymbol *parameter_symbol = p_parent->children[i];
 		if (!parameter_symbol->detail.is_empty() && parameter_symbol->name == symbol_identifier) {
 			return parameter_symbol;
 		}
@@ -184,7 +184,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_parameter_symbol(const lsp::Do
 const lsp::DocumentSymbol *GDScriptWorkspace::get_local_symbol_at(const ExtendGDScriptParser *p_parser, const String &p_symbol_identifier, const lsp::Position p_position) {
 	// Go down and pick closest `DocumentSymbol` with `p_symbol_identifier`.
 
-	const lsp::DocumentSymbol *current = &p_parser->get_symbols();
+	const lsp::DocumentSymbol *current = p_parser->get_symbols();
 	const lsp::DocumentSymbol *best_match = nullptr;
 
 	while (current) {
@@ -199,9 +199,9 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_local_symbol_at(const ExtendGD
 
 		const lsp::DocumentSymbol *parent = current;
 		current = nullptr;
-		for (const lsp::DocumentSymbol &child : parent->children) {
-			if (child.range.contains(p_position)) {
-				current = &child;
+		for (const lsp::DocumentSymbol *child : parent->children) {
+			if (child->range.contains(p_position)) {
+				current = child;
 				break;
 			}
 		}
@@ -280,57 +280,60 @@ Error GDScriptWorkspace::initialize() {
 	DocTools *doc = EditorHelp::get_doc_data();
 	for (const KeyValue<String, DocData::ClassDoc> &E : doc->class_list) {
 		const DocData::ClassDoc &class_data = E.value;
-		lsp::DocumentSymbol class_symbol;
+		lsp::DocumentSymbol *class_symbol = memnew(lsp::DocumentSymbol);
 		String class_name = E.key;
-		class_symbol.name = class_name;
-		class_symbol.native_class = class_name;
-		class_symbol.kind = lsp::SymbolKind::Class;
-		class_symbol.detail = String("<Native> class ") + class_name;
+		class_symbol->name = class_name;
+		class_symbol->native_class = class_name;
+		class_symbol->kind = lsp::SymbolKind::Class;
+		class_symbol->detail = String("<Native> class ") + class_name;
 		if (!class_data.inherits.is_empty()) {
-			class_symbol.detail += " extends " + class_data.inherits;
+			class_symbol->detail += " extends " + class_data.inherits;
 		}
-		class_symbol.documentation = class_data.brief_description + "\n" + class_data.description;
+		class_symbol->documentation = class_data.brief_description + "\n" + class_data.description;
 
 		for (int i = 0; i < class_data.constants.size(); i++) {
 			const DocData::ConstantDoc &const_data = class_data.constants[i];
-			lsp::DocumentSymbol symbol;
-			symbol.name = const_data.name;
-			symbol.native_class = class_name;
-			symbol.kind = lsp::SymbolKind::Constant;
-			symbol.detail = "const " + class_name + "." + const_data.name;
+			lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+			symbol->name = const_data.name;
+			symbol->native_class = class_name;
+			symbol->kind = lsp::SymbolKind::Constant;
+			symbol->detail = "const " + class_name + "." + const_data.name;
 			if (const_data.enumeration.length()) {
-				symbol.detail += ": " + const_data.enumeration;
+				symbol->detail += ": " + const_data.enumeration;
 			}
-			symbol.detail += " = " + const_data.value;
-			symbol.documentation = const_data.description;
-			class_symbol.children.push_back(symbol);
+			symbol->detail += " = " + const_data.value;
+			symbol->documentation = const_data.description;
+			symbol->parent = class_symbol;
+			class_symbol->children.push_back(symbol);
 		}
 
 		for (int i = 0; i < class_data.properties.size(); i++) {
 			const DocData::PropertyDoc &data = class_data.properties[i];
-			lsp::DocumentSymbol symbol;
-			symbol.name = data.name;
-			symbol.native_class = class_name;
-			symbol.kind = lsp::SymbolKind::Property;
-			symbol.detail = "var " + class_name + "." + data.name;
+			lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+			symbol->name = data.name;
+			symbol->native_class = class_name;
+			symbol->kind = lsp::SymbolKind::Property;
+			symbol->detail = "var " + class_name + "." + data.name;
 			if (data.enumeration.length()) {
-				symbol.detail += ": " + data.enumeration;
+				symbol->detail += ": " + data.enumeration;
 			} else {
-				symbol.detail += ": " + data.type;
+				symbol->detail += ": " + data.type;
 			}
-			symbol.documentation = data.description;
-			class_symbol.children.push_back(symbol);
+			symbol->documentation = data.description;
+			symbol->parent = class_symbol;
+			class_symbol->children.push_back(symbol);
 		}
 
 		for (int i = 0; i < class_data.theme_properties.size(); i++) {
 			const DocData::ThemeItemDoc &data = class_data.theme_properties[i];
-			lsp::DocumentSymbol symbol;
-			symbol.name = data.name;
-			symbol.native_class = class_name;
-			symbol.kind = lsp::SymbolKind::Property;
-			symbol.detail = "<Theme> var " + class_name + "." + data.name + ": " + data.type;
-			symbol.documentation = data.description;
-			class_symbol.children.push_back(symbol);
+			lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+			symbol->name = data.name;
+			symbol->native_class = class_name;
+			symbol->kind = lsp::SymbolKind::Property;
+			symbol->detail = "<Theme> var " + class_name + "." + data.name + ": " + data.type;
+			symbol->documentation = data.description;
+			symbol->parent = class_symbol;
+			class_symbol->children.push_back(symbol);
 		}
 
 		Vector<DocData::MethodDoc> methods_signals;
@@ -343,20 +346,20 @@ Error GDScriptWorkspace::initialize() {
 		for (int i = 0; i < methods_signals.size(); i++) {
 			const DocData::MethodDoc &data = methods_signals[i];
 
-			lsp::DocumentSymbol symbol;
-			symbol.name = data.name;
-			symbol.native_class = class_name;
-			symbol.kind = i >= signal_start_idx ? lsp::SymbolKind::Event : lsp::SymbolKind::Method;
+			lsp::DocumentSymbol *symbol = memnew(lsp::DocumentSymbol);
+			symbol->name = data.name;
+			symbol->native_class = class_name;
+			symbol->kind = i >= signal_start_idx ? lsp::SymbolKind::Event : lsp::SymbolKind::Method;
 
 			String params = "";
 			bool arg_default_value_started = false;
 			for (int j = 0; j < data.arguments.size(); j++) {
 				const DocData::ArgumentDoc &arg = data.arguments[j];
 
-				lsp::DocumentSymbol symbol_arg;
-				symbol_arg.name = arg.name;
-				symbol_arg.kind = lsp::SymbolKind::Variable;
-				symbol_arg.detail = arg.type;
+				lsp::DocumentSymbol *symbol_arg = memnew(lsp::DocumentSymbol);
+				symbol_arg->name = arg.name;
+				symbol_arg->kind = lsp::SymbolKind::Variable;
+				symbol_arg->detail = arg.type;
 
 				if (!arg_default_value_started && !arg.default_value.is_empty()) {
 					arg_default_value_started = true;
@@ -370,7 +373,8 @@ Error GDScriptWorkspace::initialize() {
 				}
 				params += arg_str;
 
-				symbol.children.push_back(symbol_arg);
+				symbol_arg->parent = symbol;
+				symbol->children.push_back(symbol_arg);
 			}
 			if (data.qualifiers.contains("vararg")) {
 				params += params.is_empty() ? "..." : ", ...";
@@ -380,9 +384,10 @@ Error GDScriptWorkspace::initialize() {
 			if (return_type.is_empty()) {
 				return_type = "void";
 			}
-			symbol.detail = "func " + class_name + "." + data.name + "(" + params + ") -> " + return_type;
-			symbol.documentation = data.description;
-			class_symbol.children.push_back(symbol);
+			symbol->detail = "func " + class_name + "." + data.name + "(" + params + ") -> " + return_type;
+			symbol->documentation = data.description;
+			symbol->parent = class_symbol;
+			class_symbol->children.push_back(symbol);
 		}
 
 		native_symbols.insert(class_name, class_symbol);
@@ -391,12 +396,12 @@ Error GDScriptWorkspace::initialize() {
 	reload_all_workspace_scripts();
 
 	if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
-		for (const KeyValue<StringName, lsp::DocumentSymbol> &E : native_symbols) {
+		for (const KeyValue<StringName, lsp::DocumentSymbol *> &E : native_symbols) {
 			ClassMembers members;
-			const lsp::DocumentSymbol &class_symbol = E.value;
-			for (int i = 0; i < class_symbol.children.size(); i++) {
-				const lsp::DocumentSymbol &symbol = class_symbol.children[i];
-				members.insert(symbol.name, &symbol);
+			const lsp::DocumentSymbol *class_symbol = E.value;
+			for (int i = 0; i < class_symbol->children.size(); i++) {
+				const lsp::DocumentSymbol *symbol = class_symbol->children[i];
+				members.insert(symbol->name, symbol);
 			}
 			native_members.insert(E.key, members);
 		}
@@ -460,7 +465,7 @@ Dictionary GDScriptWorkspace::rename(const lsp::TextDocumentPositionParams &p_do
 
 	const lsp::DocumentSymbol *reference_symbol = resolve_symbol(p_doc_pos);
 	if (is_valid_rename_target(reference_symbol)) {
-		Vector<lsp::Location> usages = find_all_usages(*reference_symbol);
+		Vector<lsp::Location> usages = find_all_usages(reference_symbol);
 		for (int i = 0; i < usages.size(); ++i) {
 			lsp::Location loc = usages[i];
 
@@ -471,7 +476,7 @@ Dictionary GDScriptWorkspace::rename(const lsp::TextDocumentPositionParams &p_do
 	return edit.to_json();
 }
 
-bool GDScriptWorkspace::can_rename(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::DocumentSymbol &r_symbol, lsp::Range &r_range) {
+bool GDScriptWorkspace::can_rename(const lsp::TextDocumentPositionParams &p_doc_pos, const lsp::DocumentSymbol *r_symbol, lsp::Range &r_range) {
 	const lsp::DocumentSymbol *reference_symbol = resolve_symbol(p_doc_pos);
 	if (!is_valid_rename_target(reference_symbol)) {
 		return false;
@@ -480,17 +485,17 @@ bool GDScriptWorkspace::can_rename(const lsp::TextDocumentPositionParams &p_doc_
 	String path = get_file_path(p_doc_pos.textDocument.uri);
 	if (const ExtendGDScriptParser *parser = get_parse_result(path)) {
 		parser->get_identifier_under_position(p_doc_pos.position, r_range);
-		r_symbol = *reference_symbol;
+		r_symbol = reference_symbol;
 		return true;
 	}
 
 	return false;
 }
 
-Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::DocumentSymbol &p_symbol, const String &p_file_path) {
+Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::DocumentSymbol *p_symbol, const String &p_file_path) {
 	Vector<lsp::Location> usages;
 
-	String identifier = p_symbol.name;
+	String identifier = p_symbol->name;
 	if (const ExtendGDScriptParser *parser = get_parse_result(p_file_path)) {
 		const PackedStringArray &content = parser->get_lines();
 		for (int i = 0; i < content.size(); ++i) {
@@ -509,7 +514,7 @@ Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::Document
 
 				const lsp::DocumentSymbol *other_symbol = resolve_symbol(params);
 
-				if (other_symbol == &p_symbol) {
+				if (other_symbol == p_symbol) {
 					lsp::Location loc;
 					loc.uri = text_doc.uri;
 					loc.range.start = params.position;
@@ -526,10 +531,10 @@ Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::Document
 	return usages;
 }
 
-Vector<lsp::Location> GDScriptWorkspace::find_all_usages(const lsp::DocumentSymbol &p_symbol) {
-	if (p_symbol.local) {
+Vector<lsp::Location> GDScriptWorkspace::find_all_usages(const lsp::DocumentSymbol *p_symbol) {
+	if (p_symbol->local) {
 		// Only search in current document.
-		return find_usages_in_file(p_symbol, p_symbol.script_path);
+		return find_usages_in_file(p_symbol, p_symbol->script_path);
 	}
 	// Search in all documents.
 	List<String> paths;
@@ -766,15 +771,15 @@ void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionP
 }
 
 const lsp::DocumentSymbol *GDScriptWorkspace::resolve_native_symbol(const lsp::NativeSymbolInspectParams &p_params) {
-	if (HashMap<StringName, lsp::DocumentSymbol>::Iterator E = native_symbols.find(p_params.native_class)) {
-		const lsp::DocumentSymbol &symbol = E->value;
-		if (p_params.symbol_name.is_empty() || p_params.symbol_name == symbol.name) {
-			return &symbol;
+	if (HashMap<StringName, lsp::DocumentSymbol *>::Iterator E = native_symbols.find(p_params.native_class)) {
+		const lsp::DocumentSymbol *symbol = E->value;
+		if (p_params.symbol_name.is_empty() || p_params.symbol_name == symbol->name) {
+			return symbol;
 		}
 
-		for (int i = 0; i < symbol.children.size(); ++i) {
-			if (symbol.children[i].name == p_params.symbol_name) {
-				return &(symbol.children[i]);
+		for (int i = 0; i < symbol->children.size(); ++i) {
+			if (symbol->children[i]->name == p_params.symbol_name) {
+				return symbol->children[i];
 			}
 		}
 	}
@@ -820,9 +825,9 @@ Error GDScriptWorkspace::resolve_signature(const lsp::TextDocumentPositionParams
 					signature_info.documentation = symbol->render();
 
 					for (int i = 0; i < symbol->children.size(); i++) {
-						const lsp::DocumentSymbol &arg = symbol->children[i];
+						const lsp::DocumentSymbol *arg = symbol->children[i];
 						lsp::ParameterInformation arg_info;
-						arg_info.label = arg.name;
+						arg_info.label = arg->name;
 						signature_info.parameters.push_back(arg_info);
 					}
 					r_signature.signatures.push_back(signature_info);
diff --git a/modules/gdscript/language_server/gdscript_workspace.h b/modules/gdscript/language_server/gdscript_workspace.h
index 0b2d43b81748..06e043247690 100644
--- a/modules/gdscript/language_server/gdscript_workspace.h
+++ b/modules/gdscript/language_server/gdscript_workspace.h
@@ -49,7 +49,7 @@ class GDScriptWorkspace : public RefCounted {
 	static void _bind_methods();
 	void remove_cache_parser(const String &p_path);
 	bool initialized = false;
-	HashMap<StringName, lsp::DocumentSymbol> native_symbols;
+	HashMap<StringName, lsp::DocumentSymbol *> native_symbols;
 
 	const lsp::DocumentSymbol *get_native_symbol(const String &p_class, const String &p_member = "") const;
 	const lsp::DocumentSymbol *get_script_symbol(const String &p_path) const;
@@ -93,9 +93,9 @@ class GDScriptWorkspace : public RefCounted {
 	Error resolve_signature(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::SignatureHelp &r_signature);
 	void did_delete_files(const Dictionary &p_params);
 	Dictionary rename(const lsp::TextDocumentPositionParams &p_doc_pos, const String &new_name);
-	bool can_rename(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::DocumentSymbol &r_symbol, lsp::Range &r_range);
-	Vector<lsp::Location> find_usages_in_file(const lsp::DocumentSymbol &p_symbol, const String &p_file_path);
-	Vector<lsp::Location> find_all_usages(const lsp::DocumentSymbol &p_symbol);
+	bool can_rename(const lsp::TextDocumentPositionParams &p_doc_pos, const lsp::DocumentSymbol *r_symbol, lsp::Range &r_range);
+	Vector<lsp::Location> find_usages_in_file(const lsp::DocumentSymbol *p_symbol, const String &p_file_path);
+	Vector<lsp::Location> find_all_usages(const lsp::DocumentSymbol *p_symbol);
 
 	GDScriptWorkspace();
 	~GDScriptWorkspace();
diff --git a/modules/gdscript/language_server/godot_lsp.h b/modules/gdscript/language_server/godot_lsp.h
index 676c8fbd31c9..f846b0ed1a5b 100644
--- a/modules/gdscript/language_server/godot_lsp.h
+++ b/modules/gdscript/language_server/godot_lsp.h
@@ -1225,10 +1225,12 @@ struct DocumentSymbol {
 	DocumentUri uri;
 	String script_path;
 
+	DocumentSymbol *parent = nullptr;
+
 	/**
 	 * Children of this symbol, e.g. properties of a class.
 	 */
-	Vector<DocumentSymbol> children;
+	Vector<DocumentSymbol *> children;
 
 	Dictionary to_json(bool with_doc = false) const {
 		Dictionary dict;
@@ -1245,10 +1247,10 @@ struct DocumentSymbol {
 		if (!children.is_empty()) {
 			Array arr;
 			for (int i = 0; i < children.size(); i++) {
-				if (children[i].local) {
+				if (children[i]->local) {
 					continue;
 				}
-				arr.push_back(children[i].to_json(with_doc));
+				arr.push_back(children[i]->to_json(with_doc));
 			}
 			if (!children.is_empty()) {
 				dict["children"] = arr;