|
@@ -172,8 +172,9 @@ let reserved_flags = [
|
|
|
"as3";"swc";"macro";"sys"
|
|
|
]
|
|
|
|
|
|
-let complete_fields fields =
|
|
|
+let complete_fields com fields =
|
|
|
let b = Buffer.create 0 in
|
|
|
+ let details = Common.raw_defined com "display-details" in
|
|
|
Buffer.add_string b "<list>\n";
|
|
|
List.iter (fun (n,t,k,d) ->
|
|
|
let s_kind = match k with
|
|
@@ -184,7 +185,10 @@ let complete_fields fields =
|
|
|
| Typer.FKPackage -> "package")
|
|
|
| None -> ""
|
|
|
in
|
|
|
- Buffer.add_string b (Printf.sprintf "<i n=\"%s\" k=\"%s\"><t>%s</t><d>%s</d></i>\n" n s_kind (htmlescape t) (htmlescape d))
|
|
|
+ if details then
|
|
|
+ Buffer.add_string b (Printf.sprintf "<i n=\"%s\" k=\"%s\"><t>%s</t><d>%s</d></i>\n" n s_kind (htmlescape t) (htmlescape d))
|
|
|
+ else
|
|
|
+ Buffer.add_string b (Printf.sprintf "<i n=\"%s\"><t>%s</t><d>%s</d></i>\n" n (htmlescape t) (htmlescape d))
|
|
|
) (List.sort (fun (a,_,ak,_) (b,_,bk,_) -> compare (ak,a) (bk,b)) fields);
|
|
|
Buffer.add_string b "</list>\n";
|
|
|
raise (Completion (Buffer.contents b))
|
|
@@ -1171,7 +1175,7 @@ try
|
|
|
| "classes" ->
|
|
|
pre_compilation := (fun() -> raise (Parser.TypePath (["."],None))) :: !pre_compilation;
|
|
|
| "keywords" ->
|
|
|
- complete_fields (Hashtbl.fold (fun k _ acc -> (k,"",None,"") :: acc) Lexer.keywords [])
|
|
|
+ complete_fields com (Hashtbl.fold (fun k _ acc -> (k,"",None,"") :: acc) Lexer.keywords [])
|
|
|
| "memory" ->
|
|
|
did_something := true;
|
|
|
(try display_memory ctx with e -> prerr_endline (Printexc.get_backtrace ()));
|
|
@@ -1580,7 +1584,7 @@ with
|
|
|
end else
|
|
|
fields
|
|
|
in
|
|
|
- complete_fields fields
|
|
|
+ complete_fields com fields
|
|
|
| Typecore.DisplayTypes tl ->
|
|
|
let ctx = print_context() in
|
|
|
let b = Buffer.create 0 in
|
|
@@ -1625,7 +1629,7 @@ with
|
|
|
if packs = [] && classes = [] then
|
|
|
error ctx ("No classes found in " ^ String.concat "." p) Ast.null_pos
|
|
|
else
|
|
|
- complete_fields (
|
|
|
+ complete_fields com (
|
|
|
let convert k f = (f,"",Some k,"") in
|
|
|
(List.map (convert Typer.FKPackage) packs) @ (List.map (convert Typer.FKType) classes)
|
|
|
)
|
|
@@ -1644,7 +1648,7 @@ with
|
|
|
raise e
|
|
|
in
|
|
|
let m = lookup p in
|
|
|
- complete_fields (List.map (fun t -> snd (t_path t),"",Some Typer.FKType,"") (List.filter (fun t -> not (t_infos t).mt_private) m.m_types))
|
|
|
+ complete_fields com (List.map (fun t -> snd (t_path t),"",Some Typer.FKType,"") (List.filter (fun t -> not (t_infos t).mt_private) m.m_types))
|
|
|
with Completion c ->
|
|
|
raise (Completion c)
|
|
|
| _ ->
|