Skip to content

Commit 4cf7ff8

Browse files
EmileTrotignonEmileTrotignon
committed
Search : printing update
1 parent 11ae820 commit 4cf7ff8

File tree

7 files changed

+307
-257
lines changed

7 files changed

+307
-257
lines changed

‎src/search/entry.ml

Lines changed: 34 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type doc_entry = Paragraph | Heading | CodeBlock | MathBlock | Verbatim
4141

4242
type value_entry = { value : Value.value; type_ : TypeExpr.t }
4343

44-
type extra =
44+
type kind =
4545
| TypeDecl of type_decl_entry
4646
| Module
4747
| Value of value_entry
@@ -61,13 +61,14 @@ module Html = Tyxml.Html
6161
type t = {
6262
id : Odoc_model.Paths.Identifier.Any.t;
6363
doc : Odoc_model.Comment.docs;
64-
extra : extra;
65-
html : Html_types.div Html.elt;
64+
kind : kind;
6665
}
6766

68-
let entry ~id ~doc ~extra ~html =
67+
type with_html = { entry : t; html : [ `Code | `Div ] Tyxml.Html.elt list }
68+
69+
let entry ~id ~doc ~kind =
6970
let id = (id :> Odoc_model.Paths.Identifier.Any.t) in
70-
{ id; extra; doc; html }
71+
{ id; kind; doc }
7172

7273
let varify_params =
7374
List.mapi (fun i param ->
@@ -77,15 +78,6 @@ let varify_params =
7778

7879
let entry_of_constructor id_parent params (constructor : TypeDecl.Constructor.t)
7980
=
80-
let html =
81-
Tyxml.Html.div ~a:[]
82-
[
83-
Tyxml.Html.txt
84-
@@ Generator.constructor
85-
(constructor.id :> Identifier.t)
86-
constructor.args constructor.res;
87-
]
88-
in
8981
let args = constructor.args in
9082
let res =
9183
match constructor.res with
@@ -97,20 +89,11 @@ let entry_of_constructor id_parent params (constructor : TypeDecl.Constructor.t)
9789
((id_parent :> Odoc_model.Paths.Identifier.Path.Type.t), false),
9890
params )
9991
in
100-
let extra = Constructor { args; res } in
101-
entry ~id:constructor.id ~doc:constructor.doc ~extra ~html
92+
let kind = Constructor { args; res } in
93+
entry ~id:constructor.id ~doc:constructor.doc ~kind
10294

10395
let entry_of_extension_constructor id_parent params
10496
(constructor : Extension.Constructor.t) =
105-
let html =
106-
Tyxml.Html.div ~a:[]
107-
[
108-
Tyxml.Html.txt
109-
@@ Generator.constructor
110-
(constructor.id :> Identifier.t)
111-
constructor.args constructor.res;
112-
]
113-
in
11497
let args = constructor.args in
11598
let res =
11699
match constructor.res with
@@ -119,8 +102,8 @@ let entry_of_extension_constructor id_parent params
119102
let params = varify_params params in
120103
TypeExpr.Constr (id_parent, params)
121104
in
122-
let extra = ExtensionConstructor { args; res } in
123-
entry ~id:constructor.id ~doc:constructor.doc ~extra ~html
105+
let kind = ExtensionConstructor { args; res } in
106+
entry ~id:constructor.id ~doc:constructor.doc ~kind
124107

125108
let entry_of_field id_parent params (field : TypeDecl.Field.t) =
126109
let params = varify_params params in
@@ -130,49 +113,42 @@ let entry_of_field id_parent params (field : TypeDecl.Field.t) =
130113
((id_parent :> Odoc_model.Paths.Identifier.Path.Type.t), false),
131114
params )
132115
in
133-
let extra =
116+
let kind =
134117
Field { mutable_ = field.mutable_; type_ = field.type_; parent_type }
135118
in
136-
let html = Html.div ~a:[] [] in
137-
entry ~id:field.id ~doc:field.doc ~extra ~html
119+
entry ~id:field.id ~doc:field.doc ~kind
138120

139121
let rec entries_of_docs (d : Odoc_model.Comment.docs) =
140122
List.concat_map entries_of_doc d
141123

142124
and entries_of_doc d =
143-
let html = Html.div ~a:[] [] in
144125
match d.value with
145-
| `Paragraph (lbl, _) ->
146-
[ entry ~id:lbl ~doc:[ d ] ~extra:(Doc Paragraph) ~html ]
126+
| `Paragraph (lbl, _) -> [ entry ~id:lbl ~doc:[ d ] ~kind:(Doc Paragraph) ]
147127
| `Tag _ -> []
148128
| `List (_, ds) ->
149129
List.concat_map entries_of_docs (ds :> Odoc_model.Comment.docs list)
150-
| `Heading (_, lbl, _) ->
151-
[ entry ~id:lbl ~doc:[ d ] ~extra:(Doc Heading) ~html ]
130+
| `Heading (_, lbl, _) -> [ entry ~id:lbl ~doc:[ d ] ~kind:(Doc Heading) ]
152131
| `Modules _ -> []
153132
| `Code_block (lbl, _, _, o) ->
154133
let o =
155134
match o with
156135
| None -> []
157136
| Some o -> entries_of_docs (o :> Odoc_model.Comment.docs)
158137
in
159-
entry ~id:lbl ~doc:[ d ] ~extra:(Doc CodeBlock) ~html :: o
160-
| `Verbatim (lbl, _) ->
161-
[ entry ~id:lbl ~doc:[ d ] ~extra:(Doc Verbatim) ~html ]
162-
| `Math_block (lbl, _) ->
163-
[ entry ~id:lbl ~doc:[ d ] ~extra:(Doc MathBlock) ~html ]
138+
entry ~id:lbl ~doc:[ d ] ~kind:(Doc CodeBlock) :: o
139+
| `Verbatim (lbl, _) -> [ entry ~id:lbl ~doc:[ d ] ~kind:(Doc Verbatim) ]
140+
| `Math_block (lbl, _) -> [ entry ~id:lbl ~doc:[ d ] ~kind:(Doc MathBlock) ]
164141
| `Table _ -> []
165142

166143
let entries_of_item (x : Odoc_model.Fold.item) =
167-
let html = Generator.html_of_entry x in
168144
match x with
169145
| CompilationUnit u -> (
170146
match u.content with
171-
| Module m -> [ entry ~id:u.id ~doc:m.doc ~extra:Module ~html ]
147+
| Module m -> [ entry ~id:u.id ~doc:m.doc ~kind:Module ]
172148
| Pack _ -> [])
173149
| TypeDecl td ->
174150
let txt = Render.text_of_typedecl td in
175-
let extra =
151+
let kind =
176152
TypeDecl
177153
{
178154
txt;
@@ -181,7 +157,7 @@ let entries_of_item (x : Odoc_model.Fold.item) =
181157
representation = td.representation;
182158
}
183159
in
184-
let td_entry = entry ~id:td.id ~doc:td.doc ~extra ~html in
160+
let td_entry = entry ~id:td.id ~doc:td.doc ~kind in
185161
let subtype_entries =
186162
match td.representation with
187163
| None -> []
@@ -192,28 +168,28 @@ let entries_of_item (x : Odoc_model.Fold.item) =
192168
| Some Extensible -> []
193169
in
194170
td_entry :: subtype_entries
195-
| Module m -> [ entry ~id:m.id ~doc:m.doc ~extra:Module ~html ]
171+
| Module m -> [ entry ~id:m.id ~doc:m.doc ~kind:Module ]
196172
| Value v ->
197-
let extra = Value { value = v.value; type_ = v.type_ } in
198-
[ entry ~id:v.id ~doc:v.doc ~extra ~html ]
173+
let kind = Value { value = v.value; type_ = v.type_ } in
174+
[ entry ~id:v.id ~doc:v.doc ~kind ]
199175
| Exception exc ->
200176
let res =
201177
Option.value exc.res
202178
~default:(TypeExpr.Constr (Odoc_model.Predefined.exn_path, []))
203179
in
204-
let extra = Exception { args = exc.args; res } in
205-
[ entry ~id:exc.id ~doc:exc.doc ~extra ~html ]
180+
let kind = Exception { args = exc.args; res } in
181+
[ entry ~id:exc.id ~doc:exc.doc ~kind ]
206182
| ClassType ct ->
207-
let extra = Class_type { virtual_ = ct.virtual_; params = ct.params } in
208-
[ entry ~id:ct.id ~doc:ct.doc ~extra ~html ]
183+
let kind = Class_type { virtual_ = ct.virtual_; params = ct.params } in
184+
[ entry ~id:ct.id ~doc:ct.doc ~kind ]
209185
| Method m ->
210-
let extra =
186+
let kind =
211187
Method { virtual_ = m.virtual_; private_ = m.private_; type_ = m.type_ }
212188
in
213-
[ entry ~id:m.id ~doc:m.doc ~extra ~html ]
189+
[ entry ~id:m.id ~doc:m.doc ~kind ]
214190
| Class cl ->
215-
let extra = Class { virtual_ = cl.virtual_; params = cl.params } in
216-
[ entry ~id:cl.id ~doc:cl.doc ~extra ~html ]
191+
let kind = Class { virtual_ = cl.virtual_; params = cl.params } in
192+
[ entry ~id:cl.id ~doc:cl.doc ~kind ]
217193
| Extension te -> (
218194
match te.constructors with
219195
| [] -> []
@@ -222,21 +198,21 @@ let entries_of_item (x : Odoc_model.Fold.item) =
222198
constructor for the url. Unfortunately, this breaks the uniqueness
223199
of the ID in the search index... *)
224200
let type_entry =
225-
let extra =
201+
let kind =
226202
TypeExtension
227203
{
228204
type_path = te.type_path;
229205
type_params = te.type_params;
230206
private_ = te.private_;
231207
}
232208
in
233-
entry ~id:c.id ~doc:te.doc ~extra ~html
209+
entry ~id:c.id ~doc:te.doc ~kind
234210
in
235211

236212
type_entry
237213
:: List.map
238214
(entry_of_extension_constructor te.type_path te.type_params)
239215
te.constructors)
240-
| ModuleType mt -> [ entry ~id:mt.id ~doc:mt.doc ~extra:ModuleType ~html ]
216+
| ModuleType mt -> [ entry ~id:mt.id ~doc:mt.doc ~kind:ModuleType ]
241217
| Doc `Stop -> []
242218
| Doc (`Docs d) -> entries_of_docs d

‎src/search/entry.mli

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type doc_entry = Paragraph | Heading | CodeBlock | MathBlock | Verbatim
4141

4242
type value_entry = { value : Value.value; type_ : TypeExpr.t }
4343

44-
type extra =
44+
type kind =
4545
| TypeDecl of type_decl_entry
4646
| Module
4747
| Value of value_entry
@@ -59,8 +59,10 @@ type extra =
5959
type t = {
6060
id : Odoc_model.Paths.Identifier.Any.t;
6161
doc : Odoc_model.Comment.docs;
62-
extra : extra;
63-
html : Html_types.div Tyxml.Html.elt;
62+
kind : kind;
6463
}
6564

65+
type with_html = { entry : t; html : [ `Code | `Div ] Tyxml.Html.elt list }
66+
(** You can use {!Generator.with_html} to get a value of this type. *)
67+
6668
val entries_of_item : Odoc_model.Fold.item -> t list

0 commit comments

Comments
 (0)