From ef44ed93a7b5d953d51290f118a86f13ff420580 Mon Sep 17 00:00:00 2001 From: "Rado'sPC\\aRaGaR" Date: Sun, 11 Feb 2018 11:29:30 +0200 Subject: [PATCH] For-in loop variable added to autocompletion Fix for #16494 (cherry picked from commit f97ebdcab3bd6e2917c24a5e4d34e1965ac2a987) --- modules/gdscript/gdscript_editor.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index db3787470f5..a94505078c9 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -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(context.block->statements[i]); + const GDScriptParser::LocalVarNode *lv = static_cast(statement); result.insert(lv->name.operator String()); + } else if (statementType == GDScriptParser::BlockNode::TYPE_CONTROL_FLOW) { + + const GDScriptParser::ControlFlowNode *cf = static_cast(statement); + if (cf->cf_type == GDScriptParser::ControlFlowNode::CF_FOR) { + + const GDScriptParser::IdentifierNode *id = static_cast(cf->arguments[0]); + result.insert(id->name.operator String()); + } } } }