Support use of generics in closures

1 files changed, 11 insertions, 0 deletions

diff --git a/vala/valalambdaexpression.vala b/vala/valalambdaexpression.vala
index d71c4b55c..889905b20 100644
--- a/vala/valalambdaexpression.vala
+++ b/vala/valalambdaexpression.vala
@@ -224,6 +224,17 @@ public class Vala.LambdaExpression : Expression {
 		}
 		method.body.owner = method.scope;
 
+		// support use of generics in closures
+		var m = analyzer.find_parent_method (analyzer.current_symbol);
+		if (m != null) {
+			foreach (var type_param in m.get_type_parameters ()) {
+				method.add_type_parameter (new TypeParameter (type_param.name, type_param.source_reference));
+
+				method.closure = true;
+				m.body.captured = true;
+			}
+		}
+
 		/* lambda expressions should be usable like MemberAccess of a method */
 		symbol_reference = method;