Переглянути джерело

fix structural extension display position

closes #6029
closes #6077
Simon Krajewski 8 роки тому
батько
коміт
2fe9b8ea9c

+ 1 - 1
src/typing/typeload.ml

@@ -573,7 +573,7 @@ and load_complex_type ctx allow_display p (t,pn) =
 				| _ ->
 					error "Can only extend structures" p
 			in
-			let il = List.map (fun (t,_) -> load_instance ctx ~allow_display (t,pn) false p) tl in
+			let il = List.map (fun (t,pn) -> load_instance ctx ~allow_display (t,pn) false p) tl in
 			let tr = ref None in
 			let t = TMono tr in
 			let r = exc_protect ctx (fun r ->

+ 17 - 0
tests/display/src/cases/Issue6029.hx

@@ -0,0 +1,17 @@
+package cases;
+
+class Issue6029 extends DisplayTestCase {
+	/**
+		typedef A = {}
+		typedef B = {}
+
+		typedef C = {
+			>A{-1-},
+			>B{-2-},
+		}
+	**/
+	function test() {
+		eq("cases.A", type(pos(1)));
+		eq("cases.B", type(pos(2)));
+	}
+}

+ 1 - 0
tests/display/src/cases/Issue6068.hx

@@ -17,6 +17,7 @@ class Issue6068 extends DisplayTestCase {
 	}
 
 	function check(fn) {
+		numTests++;
 		var result = try {
 				fn();
 				false;