src/doc/commands: refactor `CmdCode` and `CmdEntityCode`

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/doc/commands/commands_html.nit b/src/doc/commands/commands_html.nit
index c712e6c..88ddfd1 100644 (file)
--- a/src/doc/commands/commands_html.nit
+++ b/src/doc/commands/commands_html.nit
@@ -125,7 +125,7 @@ redef class CmdEntityLink
        end
 end
 
-redef class CmdEntityCode
+redef class CmdCode
        redef fun to_html do
                var output = render_code(node)
                if output == null then return ""

diff --git a/src/doc/commands/commands_json.nit b/src/doc/commands/commands_json.nit
index b109c87..cdab14e 100644 (file)
--- a/src/doc/commands/commands_json.nit
+++ b/src/doc/commands/commands_json.nit
@@ -86,7 +86,7 @@ redef class CmdEntityLink
        end
 end
 
-redef class CmdEntityCode
+redef class CmdCode
        redef fun to_json do
                var obj = new JsonObject
                var node = self.node

diff --git a/src/doc/commands/commands_md.nit b/src/doc/commands/commands_md.nit
index 78ca986..b2af510 100644 (file)
--- a/src/doc/commands/commands_md.nit
+++ b/src/doc/commands/commands_md.nit
@@ -110,7 +110,7 @@ redef class CmdEntityLink
        end
 end
 
-redef class CmdEntityCode
+redef class CmdCode
        redef fun to_md do
                var output = render_code(node)
                if output == null then return ""

diff --git a/src/doc/commands/commands_model.nit b/src/doc/commands/commands_model.nit
index 5b51e3f..ff7862e 100644 (file)
--- a/src/doc/commands/commands_model.nit
+++ b/src/doc/commands/commands_model.nit
@@ -422,10 +422,10 @@ end
 abstract class CmdCode
        super DocCommand
 
-       autoinit(model, modelbuilder, filter, format)
+       autoinit(model, filter, node, format)
 
-       # ModelBuilder used to get AST nodes
-       var modelbuilder: ModelBuilder
+       # AST node to display code from
+       var node: nullable ANode = null is optional, writable
 
        # Rendering format
        #
@@ -470,8 +470,8 @@ class CmdEntityCode
 
        autoinit(model, modelbuilder, filter, mentity, mentity_name, format)
 
-       # AST node to return
-       var node: nullable ANode = null is optional, writable
+       # ModelBuilder used to get AST nodes from entities
+       var modelbuilder: ModelBuilder
 
        # Same as `CmdEntity::init_mentity`
        #

diff --git a/src/doc/term/term.nit b/src/doc/term/term.nit
index fc864bb..de36f05 100644 (file)
--- a/src/doc/term/term.nit
+++ b/src/doc/term/term.nit
@@ -221,13 +221,12 @@ redef class CmdEntityCode
                else
                        print title
                end
-               if no_color == null or not no_color then
+               var node = self.node
+               if (no_color == null or not no_color) and node != null then
                        var ansi = render_code(node)
-                       if ansi != null then
-                               print "~~~"
-                               print ansi.write_to_string
-                               print "~~~"
-                       end
+                       print "~~~"
+                       print ansi.write_to_string
+                       print "~~~"
                else
                        printn mentity.cs_source_code
                end