diff --git a/modules/cscript/cscript_editor.cpp b/modules/cscript/cscript_editor.cpp
index 8a47863c1..24eb1efc3 100644
--- a/modules/cscript/cscript_editor.cpp
+++ b/modules/cscript/cscript_editor.cpp
@@ -2909,8 +2909,18 @@ Error CScriptLanguage::complete_code(const String &p_code, const String &p_path,
 							base_type.has_type = false;
 						}
 					} break;
-					case CScriptParser::DataType::SCRIPT:
+					
 					case CScriptParser::DataType::CSCRIPT: {
+						Ref<CScript> scr = base_type.script_type;
+						if (scr.is_valid()) {
+							for (const Map<StringName, Ref<CScript>>::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 CScriptParser::DataType::SCRIPT: {
 						Ref<Script> scr = base_type.script_type;
 						if (scr.is_valid()) {
 							Map<StringName, Variant> constants;
diff --git a/modules/cscript/cscript_parser.cpp b/modules/cscript/cscript_parser.cpp
index f6f6a054b..5ef90f112 100644
--- a/modules/cscript/cscript_parser.cpp
+++ b/modules/cscript/cscript_parser.cpp
@@ -5557,6 +5557,7 @@ bool CScriptParser::_parse_type(DataType &r_type, bool p_can_be_void) {
 					can_index = false;
 					tokenizer->advance();
 				} break;
+				case CScriptTokenizer::TK_CURSOR:
 				case CScriptTokenizer::TK_IDENTIFIER: {
 					if (can_index) {
 						_set_error("Unexpected identifier.");