Fixed issue with self inside nested descriptor callbacks

packages/imba/changelog.md

@@ -60,6 +60,8 @@ class Something
 
 * Make `@thenable` work for static methods
 
+* Fixed issue with `self` inside nested descriptor callbacks
+
 ## 2.0.0-alpha.235
 
 * Call MyMixin.mixes(class) for every class that mixes in MyMixin (if mixes function is defined).

packages/imba/src/compiler/nodes.imba1

@@ -1019,6 +1019,10 @@ export class Stack
 	def current
 		@nodes[@nodes:length - 1]
 
+	def indexOf test
+		let res = up(test)
+		res ? @nodes.indexOf(res) : -1
+
 	def up test
 		test ||= do |v| !(v isa VarOrAccess)
 
@@ -4397,8 +4401,9 @@ export class Func < Code
 	def visit stack, o
 		# any function inside descriptors should compile as strong scopes
 		if stack.@descriptor and !stack.tsc
-			@scope = MethodScope.new(self) # (o and o:scope) || typ.new(self)
-			@scope.params = @params # = ParamList.new([])
+			unless stack.indexOf(Func) > stack.indexOf(Descriptor)
+				@scope = MethodScope.new(self) # (o and o:scope) || typ.new(self)
+				@scope.params = @params # = ParamList.new([])
 
 		scope.visit
 

packages/imba/test/apps/issues/self-in-descriptor.imba

@@ -0,0 +1,18 @@
+class @desc
+	def $get target,key,name
+		target[key] or callback..call(target)
+	def $set value,target,key,name
+		target[key] = value
+
+class Item
+	number = 2
+	vals @desc do
+		[1,2,3].map do
+			$1 * number
+
+
+
+
+test "works" do
+	let item = new Item
+	eq item.vals,[2,4,6]