nitx: use AnsiHighlightVisitor

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

diff --git a/src/doc/commands/commands_model.nit b/src/doc/commands/commands_model.nit
index 230bf81..1e88381 100644 (file)
--- a/src/doc/commands/commands_model.nit
+++ b/src/doc/commands/commands_model.nit
@@ -398,7 +398,7 @@ class CmdCode
        # Rendering format
        #
        # Set the output format for this piece of code.
-       # Can be "raw" or "html".
+       # Can be "raw", "html" or "ansi".
        # Default is "raw".
        #
        # This format can be different than the format used in the command response.
@@ -431,9 +431,14 @@ class CmdCode
                        var hl = new HtmlightVisitor
                        hl.highlight_node node
                        return hl.html
+               else if format == "ansi" then
+                       var hl = new AnsiHighlightVisitor
+                       hl.highlight_node node
+                       return hl.result
                end
-               # TODO make a raw visitor
-               return node.to_s
+               var mentity = self.mentity
+               if mentity == null then return null
+               return mentity.location.text
        end
 end
 

diff --git a/src/doc/term/term.nit b/src/doc/term/term.nit
index 33b5221..61d5206 100644 (file)
--- a/src/doc/term/term.nit
+++ b/src/doc/term/term.nit
@@ -208,6 +208,9 @@ redef class CmdFeatures
 end
 
 redef class CmdCode
+
+       redef var format = "ansi" is optional
+
        redef fun execute(no_color) do
                var mentity = self.mentity
                if mentity == null then return
@@ -218,7 +221,16 @@ redef class CmdCode
                else
                        print title
                end
-               printn mentity.cs_source_code
+               if no_color == null or not no_color then
+                       var ansi = render
+                       if ansi != null then
+                               print "~~~"
+                               print ansi.write_to_string
+                               print "~~~"
+                       end
+               else
+                       printn mentity.cs_source_code
+               end
        end
 end