Merge pull request #92241 from dalexeev/gds-fix-lambda-captures-non-local-vars

GDScript: Fix lambdas capturing non-local variables

1 files changed, 17 insertions, 4 deletions

diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index a2680c932f..7fe96146da 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -4061,10 +4061,23 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident
 				mark_lambda_use_self();
 				return; // No need to capture.
 			}
-			// If the identifier is local, check if it's any kind of capture by comparing their source function.
-			// Only capture locals and enum values. Constants are still accessible from the lambda using the script reference. If not, this method is done.
-			if (p_identifier->source == GDScriptParser::IdentifierNode::UNDEFINED_SOURCE || p_identifier->source == GDScriptParser::IdentifierNode::MEMBER_CONSTANT) {
-				return;
+
+			switch (p_identifier->source) {
+				case GDScriptParser::IdentifierNode::FUNCTION_PARAMETER:
+				case GDScriptParser::IdentifierNode::LOCAL_VARIABLE:
+				case GDScriptParser::IdentifierNode::LOCAL_ITERATOR:
+				case GDScriptParser::IdentifierNode::LOCAL_BIND:
+					break; // Need to capture.
+				case GDScriptParser::IdentifierNode::UNDEFINED_SOURCE: // A global.
+				case GDScriptParser::IdentifierNode::LOCAL_CONSTANT:
+				case GDScriptParser::IdentifierNode::MEMBER_VARIABLE:
+				case GDScriptParser::IdentifierNode::MEMBER_CONSTANT:
+				case GDScriptParser::IdentifierNode::MEMBER_FUNCTION:
+				case GDScriptParser::IdentifierNode::MEMBER_SIGNAL:
+				case GDScriptParser::IdentifierNode::MEMBER_CLASS:
+				case GDScriptParser::IdentifierNode::INHERITED_VARIABLE:
+				case GDScriptParser::IdentifierNode::STATIC_VARIABLE:
+					return; // No need to capture.
 			}
 
 			GDScriptParser::FunctionNode *function_test = current_lambda->function;