Don't render alternatives as code

Author: Julow

src/markdown/generator.ml

@@ -166,12 +166,8 @@ let rec documented_src (l : DocumentedSrc.t) args nesting_level =
   let noop = paragraph noop in
   let take_code l =
     let c, _, rest =
-      let expansion_not_inlined url = not (should_inline url) in
       Take.until l ~classify:(function
         | DocumentedSrc.Code c -> Accum c
-        | DocumentedSrc.Alternative (Expansion e) ->
-            if expansion_not_inlined e.url then Accum e.summary
-            else Rec e.expansion
         | _ -> Stop_and_keep)
     in
     (c, rest)
@@ -190,7 +186,9 @@ let rec documented_src (l : DocumentedSrc.t) args nesting_level =
               (item_heading nesting_level (source_code c args))
               (continue rest)
           else noop
-      | Alternative _ -> continue rest
+      | Alternative (Expansion { url; expansion; _ }) ->
+          if should_inline url then documented_src expansion args nesting_level
+          else continue rest
       | Subpage p ->
           blocks (subpage p.content args (nesting_level + 1)) (continue rest)
       | Documented _ | Nested _ ->

test/integration/markdown.t/run.t

@@ -27,27 +27,35 @@
 
   ###### type y'
 
-  ###### module type Foo' = sig
+  ###### module type Foo'
+  
+  ###### = sig
 
   ######    type foo
 
   ###### end
 
-  ###### module Bar : sig ... end
+  ###### module Bar
+  
+  ###### module type Bar'
 
-  ###### module type Bar' = sig
+  ###### = sig
 
   ######    type bar'
 
   ###### end
 
-  ###### module type Foo = sig
+  ###### module type Foo
+  
+  ###### = sig
 
   ######    type foo
 
   ######    type bar'
 
-  ######    module type Foo' = sig
+  ######    module type Foo'
+  
+  ######    = sig
 
   ######      type foo'
 
@@ -142,7 +150,7 @@
 
   @author: David Sheets
 
-  ###### module Foo : sig ... end
+  ###### module Foo
 
   The end foo end keyword in doc comment.
 
@@ -201,7 +209,9 @@
 
   <a id="module-type-Foo'"></a>
 
-  ###### module type Foo' = sig
+  ###### module type Foo'
+  
+  ###### = sig
 
   <a id="type-foo"></a>
 
@@ -211,11 +221,13 @@
 
   <a id="module-Bar"></a>
 
-  ###### module Bar : sig ... end
+  ###### module Bar
 
   <a id="module-type-Bar'"></a>
 
-  ###### module type Bar' = sig
+  ###### module type Bar'
+  
+  ###### = sig
 
   <a id="type-bar'"></a>
 
@@ -225,7 +237,9 @@
 
   <a id="module-type-Foo"></a>
 
-  ###### module type Foo = sig
+  ###### module type Foo
+  
+  ###### = sig
 
   <a id="type-foo"></a>
 
@@ -237,7 +251,9 @@
 
   <a id="module-type-Foo'"></a>
 
-  ######    module type Foo' = sig
+  ######    module type Foo'
+  
+  ######    = sig
 
   <a id="type-foo'"></a>
 
@@ -358,7 +374,7 @@
 
   <a id="module-Foo"></a>
 
-  ###### module Foo : sig ... end
+  ###### module Foo
 
   The end foo end keyword in doc comment.