Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow typing hints for Array class (in GDScript and Inspector/ArrayPropertyEdit)

Browse source 
Closes #3586, by implementing the `1b` variation mentioned there.
This commit is contained in:
Bojidar Marinov 2016-10-26 14:38:41 +03:00
parent 24337f9c5e
commit 713f1451b9
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
4 changed files with 102 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/gdscript/gd_parser.cpp
View file

@ -2554,10 +2554,34 @@ void GDParser::_parse_class(ClassNode *p_class) {
current_export.type=type;
current_export.usage|=PROPERTY_USAGE_SCRIPT_VARIABLE;
tokenizer->advance();
String hint_prefix ="";
if(type == Variant::ARRAY && tokenizer->get_token()==GDTokenizer::TK_COMMA) {
tokenizer->advance();
while(tokenizer->get_token()==GDTokenizer::TK_BUILT_IN_TYPE) {
type = tokenizer->get_token_type();
tokenizer->advance();
if(type == Variant::ARRAY) {
hint_prefix += itos(Variant::ARRAY)+":";
if (tokenizer->get_token()==GDTokenizer::TK_COMMA) {
tokenizer->advance();
}
} else {
hint_prefix += itos(type);
break;
}
}
}
if (tokenizer->get_token()==GDTokenizer::TK_COMMA) {
// hint expected next!
tokenizer->advance();
switch(current_export.type) {
switch(type) {
case Variant::INT: {
@ -2913,7 +2937,14 @@ void GDParser::_parse_class(ClassNode *p_class) {
return;
} break;
}
}
if(current_export.type == Variant::ARRAY && !hint_prefix.empty()) {
if(current_export.hint) {
hint_prefix += "/"+itos(current_export.hint);
}
current_export.hint_string=hint_prefix+":"+current_export.hint_string;
current_export.hint=PROPERTY_HINT_NONE;
}
} else if (tokenizer->get_token()==GDTokenizer::TK_IDENTIFIER) {