[display] raise_position -> raise_positions

src/compiler/main.ml

@@ -1013,7 +1013,7 @@ with
 		error ctx ("Error: " ^ msg) null_pos
 	| HelpMessage msg ->
 		message ctx (CMInfo(msg,null_pos))
-	| DisplayException(DisplayHover _ | DisplayPosition _ | DisplayFields _ | DisplayPackage _  | DisplaySignatures _ as de) when ctx.com.json_out <> None ->
+	| DisplayException(DisplayHover _ | DisplayPositions _ | DisplayFields _ | DisplayPackage _  | DisplaySignatures _ as de) when ctx.com.json_out <> None ->
 		begin
 			DisplayPosition.display_position#reset;
 			match ctx.com.json_out with
@@ -1074,7 +1074,7 @@ with
 			raise (DisplayOutput.Completion (DisplayOutput.print_signature signatures display_arg))
 		else
 			raise (DisplayOutput.Completion (DisplayOutput.print_signatures signatures))
-	| DisplayException(DisplayPosition pl) ->
+	| DisplayException(DisplayPositions pl) ->
 		DisplayPosition.display_position#reset;
 		raise (DisplayOutput.Completion (DisplayOutput.print_positions pl))
 	| Parser.TypePath (p,c,is_import,pos) ->

src/context/display/displayEmitter.ml

@@ -144,9 +144,9 @@ let display_module_type ctx mt p = match ctx.com.display.dms_kind with
 		begin match mt with
 		| TClassDecl c when Meta.has Meta.CoreApi c.cl_meta ->
 			let c' = ctx.g.do_load_core_class ctx c in
-			raise_position [c.cl_name_pos;c'.cl_name_pos]
+			raise_positions [c.cl_name_pos;c'.cl_name_pos]
 		| _ ->
-			raise_position [(t_infos mt).mt_name_pos];
+			raise_positions [(t_infos mt).mt_name_pos];
 		end
 	| DMUsage _ ->
 		let infos = t_infos mt in
@@ -190,7 +190,7 @@ let raise_position_of_type t =
 	let mt =
 		let rec follow_null t =
 			match t with
-				| TMono r -> (match !r with None -> raise_position [null_pos] | Some t -> follow_null t)
+				| TMono r -> (match !r with None -> raise_positions [null_pos] | Some t -> follow_null t)
 				| TLazy f -> follow_null (lazy_type f)
 				| TAbstract({a_path = [],"Null"},[t]) -> follow_null t
 				| TDynamic _ -> !t_dynamic_def
@@ -199,12 +199,12 @@ let raise_position_of_type t =
 		try
 			Type.module_type_of_type (follow_null t)
 		with
-			Exit -> raise_position [null_pos]
+			Exit -> raise_positions [null_pos]
 	in
-	raise_position [(t_infos mt).mt_name_pos]
+	raise_positions [(t_infos mt).mt_name_pos]
 
 let display_variable ctx v p = match ctx.com.display.dms_kind with
-	| DMDefinition -> raise_position [v.v_pos]
+	| DMDefinition -> raise_positions [v.v_pos]
 	| DMTypeDefinition -> raise_position_of_type v.v_type
 	| DMUsage _ -> ReferencePosition.set (v.v_name,v.v_pos,KVar)
 	| DMHover ->
@@ -213,7 +213,7 @@ let display_variable ctx v p = match ctx.com.display.dms_kind with
 	| _ -> ()
 
 let display_field ctx origin scope cf p = match ctx.com.display.dms_kind with
-	| DMDefinition -> raise_position [cf.cf_name_pos]
+	| DMDefinition -> raise_positions [cf.cf_name_pos]
 	| DMTypeDefinition -> raise_position_of_type cf.cf_type
 	| DMUsage _ ->
 		let name,kind = match cf.cf_name,origin with
@@ -242,7 +242,7 @@ let maybe_display_field ctx origin scope cf p =
 	if display_position#enclosed_in p then display_field ctx origin scope cf p
 
 let display_enum_field ctx en ef p = match ctx.com.display.dms_kind with
-	| DMDefinition -> raise_position [ef.ef_name_pos]
+	| DMDefinition -> raise_positions [ef.ef_name_pos]
 	| DMTypeDefinition -> raise_position_of_type ef.ef_type
 	| DMUsage _ -> ReferencePosition.set (ef.ef_name,ef.ef_name_pos,KEnumField)
 	| DMHover ->

src/context/display/displayException.ml

@@ -22,7 +22,7 @@ type kind =
 	| Metadata of string
 	| DisplaySignatures of ((tsignature * CompletionType.ct_function) * documentation) list * int * int * signature_kind
 	| DisplayHover of hover_result
-	| DisplayPosition of pos list
+	| DisplayPositions of pos list
 	| DisplayFields of CompletionItem.t list * CompletionResultKind.t * pos option (* insert pos *)
 	| DisplayPackage of string list
 
@@ -34,7 +34,7 @@ let raise_module_symbols s = raise (DisplayException(ModuleSymbols s))
 let raise_metadata s = raise (DisplayException(Metadata s))
 let raise_signatures l isig iarg kind = raise (DisplayException(DisplaySignatures(l,isig,iarg,kind)))
 let raise_hover item expected p = raise (DisplayException(DisplayHover({hitem = item;hpos = p;hexpected = expected})))
-let raise_position pl = raise (DisplayException(DisplayPosition pl))
+let raise_positions pl = raise (DisplayException(DisplayPositions pl))
 let raise_fields ckl cr po = raise (DisplayException(DisplayFields(ckl,cr,po)))
 let raise_package sl = raise (DisplayException(DisplayPackage sl))
 
@@ -97,7 +97,7 @@ let to_json ctx de =
 			"item",CompletionItem.to_json ctx hover.hitem;
 			"expected",expected;
 		]
-	| DisplayPosition pl ->
+	| DisplayPositions pl ->
 		jarray (List.map generate_pos_as_location pl)
 	| DisplayFields(fields,kind,po) ->
 		fields_to_json ctx fields kind po

src/context/display/findReferences.ml

@@ -192,4 +192,4 @@ let find_references tctx com with_definition =
 	) usages in
 	t();
 	Display.ReferencePosition.set ("",null_pos,KVar);
-	DisplayException.raise_position usages
+	DisplayException.raise_positions usages

src/typing/typeload.ml

@@ -170,7 +170,7 @@ let load_type_def ctx p t =
 let resolve_position_by_path ctx path p =
 	let mt = load_type_def ctx p path in
 	let p = (t_infos mt).mt_pos in
-	raise_position [p]
+	raise_positions [p]
 
 let check_param_constraints ctx types t pl c p =
 	match follow t with
@@ -861,7 +861,7 @@ let handle_path_display ctx path p =
 			   which might not even exist anyway. *)
 			let mt = ctx.g.do_load_module ctx (sl,s) p in
 			let p = { pfile = mt.m_extra.m_file; pmin = 0; pmax = 0} in
-			DisplayException.raise_position [p]
+			DisplayException.raise_positions [p]
 		| (IDKModule(sl,s),_),DMHover ->
 			let m = ctx.g.do_load_module ctx (sl,s) p in
 			begin try

src/typing/typerDisplay.ml

@@ -155,7 +155,7 @@ let display_dollar_type ctx p make_type =
 		let t = TFun(arg,mono) in
 		raise_hover (make_ci_expr (mk (TIdent "trace") t p) (make_type t)) (Some (WithType.named_argument "expression")) p
 	| DMDefinition | DMTypeDefinition ->
-		raise_position []
+		raise_positions []
 	| _ ->
 		error "Unsupported method" p
 	end
@@ -387,7 +387,7 @@ and display_expr ctx e_ast e dk with_type p =
 			[]
 		in
 		let pl = loop e in
-		raise_position pl
+		raise_positions pl
 	| DMTypeDefinition ->
 		raise_position_of_type e.etype
 	| DMDefault when not (!Parser.had_resume)->
@@ -475,7 +475,7 @@ let handle_display ctx e_ast dk with_type =
 			let t = TFun(arg,ret) in
 			raise_hover (make_ci_expr (mk (TIdent "trace") t p) (tpair t)) (Some (WithType.named_argument "value")) p
 		| DMDefinition | DMTypeDefinition ->
-			raise_position []
+			raise_positions []
 		| _ ->
 			error "Unsupported method" p
 		end