From 7afbd5904e8cfccd8e87ddfca9f05359ca2df113 Mon Sep 17 00:00:00 2001
From: ray90514 <ray90514@hotmail.com>
Date: Fri, 9 Apr 2021 23:02:39 +0800
Subject: [PATCH] Fix Script editor completion doesn't suggest members of a
 script for type hints

---
 modules/gdscript/gdscript_editor.cpp | 11 ++++++++++-
 modules/gdscript/gdscript_parser.cpp |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index d1b49076abd7..89eadd9ca6f8 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -2983,8 +2983,17 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path
 							base_type.has_type = false;
 						}
 					} break;
-					case GDScriptParser::DataType::SCRIPT:
 					case GDScriptParser::DataType::GDSCRIPT: {
+						Ref<GDScript> scr = base_type.script_type;
+						if (scr.is_valid()) {
+							for (const Map<StringName, Ref<GDScript>>::Element *E = scr->get_subclasses().front(); E; E = E->next()) {
+								ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
+								options.insert(option.display, option);
+							}
+						}
+						FALLTHROUGH;
+					}
+					case GDScriptParser::DataType::SCRIPT: {
 						Ref<Script> scr = base_type.script_type;
 						if (scr.is_valid()) {
 							Map<StringName, Variant> constants;
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 374b0a7a9535..c8ba737ccd21 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -5786,6 +5786,7 @@ bool GDScriptParser::_parse_type(DataType &r_type, bool p_can_be_void) {
 					can_index = false;
 					tokenizer->advance();
 				} break;
+				case GDScriptTokenizer::TK_CURSOR:
 				case GDScriptTokenizer::TK_IDENTIFIER: {
 					if (can_index) {
 						_set_error("Unexpected identifier.");