godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65264 from MewPurPur/all-hail-icon-annotation

This commit is contained in:
Rémi Verschelde 2022-09-02 23:15:31 +02:00
parent c9b3d208e1 126901cfce
commit e64eb120a8
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gdscript/gdscript_parser.cpp
View File

@ -686,17 +686,6 @@ void GDScriptParser::parse_class_name() {
current_class->identifier = parse_identifier(); current_class->identifier = parse_identifier();
} }
// TODO: Move this to annotation
if (match(GDScriptTokenizer::Token::COMMA)) {
// Icon path.
if (consume(GDScriptTokenizer::Token::LITERAL, R"(Expected class icon path string after ",".)")) {
if (previous.literal.get_type() != Variant::STRING) {
push_error(vformat(R"(Only strings can be used for the class icon path, found "%s" instead.)", Variant::get_type_name(previous.literal.get_type())));
}
current_class->icon_path = previous.literal;
}
}
if (match(GDScriptTokenizer::Token::EXTENDS)) { if (match(GDScriptTokenizer::Token::EXTENDS)) {
// Allow extends on the same line. // Allow extends on the same line.
parse_extends(); parse_extends();