northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6930 from bojidar-bg/gdscript-export-array-hint

Browse Source 
Allow typing hints for Array class (in GDScript and Inspector)
This commit is contained in:
Rémi Verschelde
2017-01-11 14:46:38 +01:00
committed by GitHub
parent 34c33648f2 713f1451b9
commit 42802ab9dc
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

@ -2658,10 +2658,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: {
@ -3017,7 +3041,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) {