type without completion optimization if first completion failed (fixed issue #1286)

main.ml

@@ -1319,7 +1319,7 @@ with
 			fields
 		in
 		complete_fields fields
-	| Typer.DisplayTypes tl ->
+	| Typecore.DisplayTypes tl ->
 		let ctx = print_context() in
 		let b = Buffer.create 0 in
 		List.iter (fun t ->

optimizer.ml

@@ -966,7 +966,7 @@ let rec make_constant_expression ctx e =
 	We will look at local variables in the form   var v = new ....
 	we only capture the ones which have constructors marked as inlined
 	then we make sure that these locals are no more referenced except for fields accesses
-	
+
 	Second pass :
 	We replace the variables by their fields lists, and the corresponding fields accesses as well
 *)
@@ -1226,18 +1226,4 @@ let optimize_completion_expr e =
 	in
 	(try loop e with Return e -> e)
 
-let optimize_completion c fields =
-	let cp = !Parser.resume_display in
-	List.map (fun f ->
-		if cp.pmin = 0 || (f.cff_pos.pmin <= cp.pmin && f.cff_pos.pmax >= cp.pmax) then
-			let k = try (match f.cff_kind with
-				| FVar (t,Some e) -> FVar (t,Some (optimize_completion_expr e))
-				| FFun fn -> (match optimize_completion_expr (EFunction (None,fn),f.cff_pos) with (EFunction (None,fn),_) -> FFun fn | e -> FFun({ fn with f_expr = Some e; f_args = []; }))
-				| k -> k
-			) with Exit -> f.cff_kind in
-			{ f with cff_kind = k }
-		else
-			f
-	) fields
-
 (* ---------------------------------------------------------------------- *)

std/Reflect.hx

@@ -89,7 +89,7 @@ extern class Reflect {
 		Returns the fields of structure [o].
 		
 		This method is only guaranteed to work on anonymous structures. Refer to
-		[Type.getInstancefields()] for a function supporting class instances.
+		[Type.getInstanceFields()] for a function supporting class instances.
 		
 		If [o] is null, the result is unspecified.
 	**/

typecore.ml

@@ -132,6 +132,8 @@ exception Forbid_package of (string * path * pos) * pos list * string
 
 exception Error of error_msg * pos
 
+exception DisplayTypes of t list
+
 exception DisplayPosition of Ast.pos list
 
 let make_call_ref : (typer -> texpr -> texpr list -> t -> pos -> texpr) ref = ref (fun _ _ _ _ _ -> assert false)

typeload.ml

@@ -968,7 +968,7 @@ let type_function_params ctx fd fname p =
 	) fd.f_params;
 	!params
 
-let type_function ctx args ret fmode f p =
+let type_function ctx args ret fmode f do_display p =
 	let locals = save_locals ctx in
 	let fargs = List.map (fun (n,c,t) ->
 		let c = (match c with
@@ -989,7 +989,12 @@ let type_function ctx args ret fmode f p =
 	ctx.curfun <- fmode;
 	ctx.ret <- ret;
 	ctx.opened <- [];
-	let e = type_expr ctx (match f.f_expr with None -> error "Function body required" p | Some e -> e) NoValue in
+	let e = match f.f_expr with None -> error "Function body required" p | Some e -> e in
+	let e = if not do_display then type_expr ctx e NoValue else try
+		type_expr ctx (Optimizer.optimize_completion_expr e) NoValue
+	with DisplayTypes [TMono _] | Parser.TypePath (_,None) ->
+		type_expr ctx e NoValue
+	in
 	let rec loop e =
 		match e.eexpr with
 		| TReturn (Some _) -> raise Exit
@@ -1264,7 +1269,7 @@ let init_class ctx c p context_init herits fields =
 
 	let display_file = if ctx.com.display then Common.unique_full_path p.pfile = (!Parser.resume_display).pfile else false in
 
-	let fields = if not display_file || Common.defined ctx.com Define.NoCOpt then fields else Optimizer.optimize_completion c fields in
+	let cp = !Parser.resume_display in
 
 	let delayed_expr = ref [] in
 
@@ -1528,7 +1533,8 @@ let init_class ctx c p context_init herits fields =
 						| _ ->
 							if constr then FunConstructor else if stat then FunStatic else FunMember
 					) in
-					let e , fargs = type_function ctx args ret fmode fd p in
+					let display_field = f.cff_pos.pmin <= cp.pmin && f.cff_pos.pmax >= cp.pmax in
+					let e , fargs = type_function ctx args ret fmode fd display_field p in
 					let f = {
 						tf_args = fargs;
 						tf_type = ret;

typer.ml

@@ -37,7 +37,6 @@ type access_mode =
 	| MSet
 	| MCall
 
-exception DisplayTypes of t list
 exception DisplayFields of (string * t * documentation) list
 exception DisplayMetadata of metadata_entry list
 exception WithTypeError of unify_error list * pos
@@ -2821,7 +2820,7 @@ and type_expr ctx (e,p) (with_type:with_type) =
 				if v.[0] = '$' then display_error ctx "Variables names starting with a dollar are not allowed" p;
 				Some (add_local ctx v ft)
 		) in
-		let e , fargs = Typeload.type_function ctx args rt (match ctx.curfun with FunStatic -> FunStatic | _ -> FunMemberLocal) f p in
+		let e , fargs = Typeload.type_function ctx args rt (match ctx.curfun with FunStatic -> FunStatic | _ -> FunMemberLocal) f false p in
 		ctx.type_params <- old;
 		let f = {
 			tf_args = fargs;