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

Merge pull request #16556 from aragar/master 

For-in loop variable added to autocompletion
This commit is contained in:
Juan Linietsky 2018-04-08 17:25:01 -03:00 committed by GitHub
parent 3a08f1748b f97ebdcab3
commit 34e367597d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gdscript/gdscript_editor.cpp
View File

@ -1333,13 +1333,23 @@ static void _find_identifiers_in_block(GDScriptCompletionContext &context, int p
for (int i = 0; i < context.block->statements.size(); i++) { for (int i = 0; i < context.block->statements.size(); i++) {
if (context.block->statements[i]->line > p_line) GDScriptParser::Node *statement = context.block->statements[i];
if (statement->line > p_line)
continue; continue;
if (context.block->statements[i]->type == GDScriptParser::BlockNode::TYPE_LOCAL_VAR) { GDScriptParser::BlockNode::Type statementType = statement->type;
if (statementType == GDScriptParser::BlockNode::TYPE_LOCAL_VAR) {
const GDScriptParser::LocalVarNode *lv = static_cast<const GDScriptParser::LocalVarNode *>(context.block->statements[i]); const GDScriptParser::LocalVarNode *lv = static_cast<const GDScriptParser::LocalVarNode *>(statement);
result.insert(lv->name.operator String()); result.insert(lv->name.operator String());
} else if (statementType == GDScriptParser::BlockNode::TYPE_CONTROL_FLOW) {
const GDScriptParser::ControlFlowNode *cf = static_cast<const GDScriptParser::ControlFlowNode *>(statement);
if (cf->cf_type == GDScriptParser::ControlFlowNode::CF_FOR) {
const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(cf->arguments[0]);
result.insert(id->name.operator String());
}
} }
} }
} }