1 files changed, 33 insertions, 10 deletions

diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index b90c452346..9f848b02f5 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -32,6 +32,8 @@
 
 #include "../gdscript.h"
 #include "../gdscript_parser.h"
+#include "gdscript_language_protocol.h"
+
 #include "core/config/project_settings.h"
 #include "core/object/script_language.h"
 #include "editor/doc_tools.h"
@@ -39,7 +41,6 @@
 #include "editor/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "gdscript_language_protocol.h"
 #include "scene/resources/packed_scene.h"
 
 void GDScriptWorkspace::_bind_methods() {
@@ -185,15 +186,27 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_local_symbol(const ExtendGDScr
 	const lsp::DocumentSymbol *class_symbol = &p_parser->get_symbols();
 
 	for (int i = 0; i < class_symbol->children.size(); ++i) {
-		if (class_symbol->children[i].kind == lsp::SymbolKind::Function || class_symbol->children[i].kind == lsp::SymbolKind::Class) {
-			const lsp::DocumentSymbol *function_symbol = &class_symbol->children[i];
+		int kind = class_symbol->children[i].kind;
+		switch (kind) {
+			case lsp::SymbolKind::Function:
+			case lsp::SymbolKind::Method:
+			case lsp::SymbolKind::Class: {
+				const lsp::DocumentSymbol *function_symbol = &class_symbol->children[i];
+
+				for (int l = 0; l < function_symbol->children.size(); ++l) {
+					const lsp::DocumentSymbol *local = &function_symbol->children[l];
+					if (!local->detail.is_empty() && local->name == p_symbol_identifier) {
+						return local;
+					}
+				}
+			} break;
 
-			for (int l = 0; l < function_symbol->children.size(); ++l) {
-				const lsp::DocumentSymbol *local = &function_symbol->children[l];
-				if (!local->detail.is_empty() && local->name == p_symbol_identifier) {
-					return local;
+			case lsp::SymbolKind::Variable: {
+				const lsp::DocumentSymbol *variable_symbol = &class_symbol->children[i];
+				if (variable_symbol->name == p_symbol_identifier) {
+					return variable_symbol;
 				}
-			}
+			} break;
 		}
 	}
 
@@ -650,8 +663,18 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 						if (const ExtendGDScriptParser *target_parser = get_parse_result(target_script_path)) {
 							symbol = target_parser->get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(ret.location));
 
-							if (symbol && symbol->kind == lsp::SymbolKind::Function && symbol->name != symbol_identifier) {
-								symbol = get_parameter_symbol(symbol, symbol_identifier);
+							if (symbol) {
+								switch (symbol->kind) {
+									case lsp::SymbolKind::Function: {
+										if (symbol->name != symbol_identifier) {
+											symbol = get_parameter_symbol(symbol, symbol_identifier);
+										}
+									} break;
+
+									case lsp::SymbolKind::Variable: {
+										symbol = get_local_symbol(parser, symbol_identifier);
+									} break;
+								}
 							}
 						}