nitls: correctly sort by names with --tree

[nit.git] / src / nitls.nit

diff --git a/src/nitls.nit b/src/nitls.nit
index ad087ee..9bfafd7 100644 (file)
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -20,11 +20,13 @@ module nitls
 import modelbuilder
 intrude import loader
 import ordered_tree
+import console
 
 class ProjTree
        super OrderedTree[Object]
 
        var opt_paths = false
+       var tc: ToolContext
 
        redef fun display(o)
        do
@@ -34,21 +36,51 @@ class ProjTree
                        else
                                var d = ""
                                if o.mdoc != null then
-                                       d = ": {o.mdoc.content.first}"
+                                       if tc.opt_no_color.value then
+                                               d = ": {o.mdoc.content.first}"
+                                       else
+                                               d = ": {o.mdoc.content.first.green}"
+                                       end
+                               end
+                               if tc.opt_no_color.value then
+                                       return "{o.name}{d} ({o.filepath.to_s})"
+                               else
+                                       return "{o.name}{d} ({o.filepath.yellow})"
                                end
-                               return "{o.name} ({o.filepath.to_s}){d}"
                        end
                else if o isa ModulePath then
                        if opt_paths then
                                return o.filepath
-                       else if o.mmodule != null then
+                       else
                                var d = ""
-                               if o.mmodule.mdoc != null then
-                                       d = ": {o.mmodule.mdoc.content.first}"
+                               var dd = ""
+                               if o.mmodule != null and o.mmodule.mdoc != null then
+                                       if tc.opt_no_color.value then
+                                               d = ": {o.mmodule.mdoc.content.first}"
+                                       else
+                                               d = ": {o.mmodule.mdoc.content.first.green}"
+                                       end
+                               end
+                               if o.mmodule != null and not o.mmodule.in_importation.direct_greaters.is_empty then
+                                       var ms = new Array[String]
+                                       for m in o.mmodule.in_importation.direct_greaters do
+                                               if m.mgroup.mproject == o.mmodule.mgroup.mproject then
+                                                       ms.add m.name
+                                               else
+                                                       ms.add m.full_name
+                                               end
+                                       end
+                                       if tc.opt_no_color.value then
+                                               dd = " ({ms.join(" ")})"
+                                       else
+                                               dd = " ({ms.join(" ")})".light_gray
+                                       end
+                               end
+                               if tc.opt_no_color.value then
+                                       return "{o.name.bold}{d} ({o.filepath.to_s}){dd}"
+                               else
+                                       return "{o.name.bold}{d} ({o.filepath.yellow}){dd}"
                                end
-                               return "{o.name}{d} ({o.filepath})"
-                       else
-                               return "{o.name} ({o.filepath})"
                        end
                else
                        abort
@@ -56,6 +88,24 @@ class ProjTree
        end
 end
 
+class AlphaEntityComparator
+       super Comparator
+       fun nameof(a: COMPARED): String
+       do
+               if a isa MGroup then
+                       return a.name
+               else if a isa ModulePath then
+                       return a.name
+               else
+                       abort
+               end
+       end
+       redef fun compare(a,b)
+       do
+               return nameof(a) <=> nameof(b)
+       end
+end
+
 var tc = new ToolContext
 
 var opt_keep = new OptionBool("Ignore errors and files that are not a Nit source file", "-k", "--keep")
@@ -122,18 +172,22 @@ end
 
 if sum == 0 then opt_project.value = true
 
-var ot = new ProjTree
+var ot = new ProjTree(tc)
 if opt_tree.value then
        ot.opt_paths = opt_paths.value
        for p in model.mprojects do
                for g in p.mgroups do
-                       ot.add(g.parent, g)
+                       var pa = g.parent
+                       if g.is_interesting then
+                               ot.add(pa, g)
+                               pa = g
+                       end
                        for mp in g.module_paths do
-                               ot.add(g, mp)
+                               ot.add(pa, mp)
                        end
                end
        end
-       ot.sort_with(new CachedAlphaComparator)
+       ot.sort_with(new AlphaEntityComparator)
        ot.write_to(stdout)
 end
 
@@ -161,7 +215,11 @@ if opt_project.value then
                if opt_paths.value then
                        list.add(path)
                else
-                       list.add("{p.name} ({path})")
+                       if tc.opt_no_color.value then
+                               list.add("{p.name} ({path})")
+                       else
+                               list.add("{p.name} ({path.yellow})")
+                       end
                end
        end
        alpha_comparator.sort(list)