Browse Source

[display] list @:deprecated meta in display/completion responses

Alexander Kuzmenko 6 years ago
parent
commit
0806c2f9b2
2 changed files with 8 additions and 3 deletions
  1. 2 2
      src/core/display/completionItem.ml
  2. 6 1
      src/core/json/genjson.ml

+ 2 - 2
src/core/display/completionItem.ml

@@ -230,14 +230,14 @@ module CompletionModuleType = struct
 			("kind",jint (to_int cm.kind)) ::
 			(match ctx.generation_mode with
 			| GMFull | GMWithoutDoc ->
+				("meta",generate_metadata ctx cm.meta) ::
 				("pos",generate_pos ctx cm.pos) ::
 				("params",jlist (generate_ast_type_param ctx) cm.params) ::
-				("meta",generate_metadata ctx cm.meta) ::
 				("isExtern",jbool cm.is_extern) ::
 				("isFinal",jbool cm.is_final) ::
 				(if ctx.generation_mode = GMFull then ["doc",jopt jstring cm.doc] else [])
 			| GMMinimum ->
-				[]
+				[("meta",generate_minimum_metadata ctx cm.meta)]
 			)
 		in
 		jobject fields

+ 6 - 1
src/core/json/genjson.ml

@@ -149,7 +149,6 @@ and generate_metadata_entry ctx (m,el,p) =
 	jobject [
 		"name",jstring (Meta.to_string m);
 		"params",jlist (generate_expr ctx) el;
-		"pos",generate_pos ctx p;
 	]
 
 and generate_metadata ctx ml =
@@ -159,6 +158,12 @@ and generate_metadata ctx ml =
 	) ml in
 	jlist (generate_metadata_entry ctx) ml
 
+and generate_minimum_metadata ctx ml =
+	let ml = List.filter (fun (m,_,_) ->
+		m = Meta.Deprecated
+	) ml in
+	jlist (generate_metadata_entry ctx) ml
+
 (* AST.ml structures *)
 
 let rec generate_ast_type_param ctx tp = jobject [