maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

For-in loop variable added to autocompletion

Browse source 
Fix for #16494

(cherry picked from commit f97ebdcab3)
This commit is contained in:
Rado'sPC\aRaGaR 2018-02-11 11:29:30 +02:00 committed by Hein-Pieter van Braam
parent 4f0b5f7307
commit ef44ed93a7
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++) {
if (context.block->statements[i]->line > p_line)
GDScriptParser::Node *statement = context.block->statements[i];
if (statement->line > p_line)
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());
} 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());
}
}
}
}