Merge: Refactorize nitunit

[nit.git] / src / doc / doc_down.nit

diff --git a/src/doc/doc_down.nit b/src/doc/doc_down.nit
index 5284dc1..9bb75af 100644 (file)
--- a/src/doc/doc_down.nit
+++ b/src/doc/doc_down.nit
@@ -35,11 +35,11 @@ redef class MDoc
        var documentation: String is lazy do return content.join("\n").html_escape
 
        private var markdown_proc: MarkdownProcessor is lazy do
-               return original_mentity.model.nitdoc_md_processor
+               return original_mentity.as(not null).model.nitdoc_md_processor
        end
 
        private var inline_proc: MarkdownProcessor is lazy do
-               return original_mentity.model.nitdoc_inline_processor
+               return original_mentity.as(not null).model.nitdoc_inline_processor
        end
 
        # Renders the synopsis as a HTML comment block.
@@ -64,6 +64,8 @@ redef class MDoc
        # Renders markdown line as a HTML comment block.
        private fun lines_to_html(lines: Array[String]): Writable do
                var res = new Template
+               var decorator = markdown_proc.emitter.decorator.as(NitdocDecorator)
+               decorator.current_mdoc = self
                res.add "<div class=\"nitdoc\">"
                # do not use DocUnit as synopsys
                if not lines.is_empty then
@@ -88,21 +90,30 @@ redef class MDoc
                # add other lines
                res.add markdown_proc.process(lines.join("\n"))
                res.add "</div>"
+               decorator.current_mdoc = null
                return res
 
        end
 end
 
-private class NitdocDecorator
+# The specific markdown decorator used internally to process MDoc object.
+#
+# You should use the various methods of `MDoc` like `MDoc::html_documentation`
+#
+# The class is public so specific behavior can be plugged on it.
+class NitdocDecorator
        super HTMLDecorator
 
-       var toolcontext = new ToolContext
+       private var toolcontext = new ToolContext
+
+       # The currently processed mdoc.
+       #
+       # Unfortunately, this seems to be the simpler way to get the currently processed `MDoc` object.
+       var current_mdoc: nullable MDoc = null
 
        redef fun add_code(v, block) do
-               var meta = "nit"
-               if block isa BlockFence and block.meta != null then
-                       meta = block.meta.to_s
-               end
+               var meta = block.meta or else "nit"
+
                # Do not try to highlight non-nit code.
                if meta != "nit" and meta != "nitish" then
                        v.add "<pre class=\"{meta}\"><code>"
@@ -111,7 +122,7 @@ private class NitdocDecorator
                        return
                end
                # Try to parse code
-               var code = code_from_block(block)
+               var code = block.raw_content
                var ast = toolcontext.parse_something(code)
                if ast isa AError then
                        v.add "<pre class=\"{meta}\"><code>"
@@ -145,30 +156,11 @@ private class NitdocDecorator
                v.add "</code>"
        end
 
-       fun code_from_text(buffer: Text, from, to: Int): String do
+       private fun code_from_text(buffer: Text, from, to: Int): String do
                var out = new FlatBuffer
                for i in [from..to[ do out.add buffer[i]
                return out.write_to_string
        end
-
-       fun code_from_block(block: BlockCode): String do
-               var infence = block isa BlockFence
-               var text = new FlatBuffer
-               var line = block.block.first_line
-               while line != null do
-                       if not line.is_empty then
-                               var str = line.value
-                               if not infence and str.has_prefix("    ") then
-                                       text.append str.substring(4, str.length - line.trailing)
-                               else
-                                       text.append str
-                               end
-                       end
-                       text.append "\n"
-                       line = line.next
-               end
-               return text.write_to_string
-       end
 end
 
 # Decorator for span elements.