ni: fix imported classes list in module view

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

diff --git a/src/model_utils.nit b/src/model_utils.nit
index 545ea69..44cf8e8 100644 (file)
--- a/src/model_utils.nit
+++ b/src/model_utils.nit
@@ -34,6 +34,7 @@ redef class MModule
        fun imported_mclasses: Set[MClass] do
                var mclasses = new HashSet[MClass]
                for m in in_importation.greaters do
+                       if m == self then continue
                        for c in m.mclassdefs do mclasses.add(c.mclass)
                end
                return mclasses

diff --git a/src/ni.nit b/src/ni.nit
index 28a63a6..9c70924 100644 (file)
--- a/src/ni.nit
+++ b/src/ni.nit
@@ -134,11 +134,11 @@ class NitIndex
                        var cats = new HashMap[String, Collection[MClass]]
                        cats["introduced classes"] = mmodule.intro_mclasses
                        cats["refined classes"] = mmodule.redef_mclasses
-                       cats["inherited classes"] = mmodule.imported_mclasses
+                       cats["imported classes"] = mmodule.imported_mclasses
 
                        for cat, list in cats do
                                if not list.is_empty then
-                                       pager.add("# {cat}".bold)
+                                       pager.add("\n# {cat}".bold)
                                        for mclass in list do
                                                var nclass = mbuilder.mclassdef2nclassdef[mclass.intro].as(AStdClassdef)
                                                pager.add("")
@@ -150,7 +150,7 @@ class NitIndex
                                                else
                                                        pager.add("\t{mclass.short_doc}")
                                                end
-                                               if not mclass.intro_mmodule == mmodule then
+                                               if cat != "introduced classes" then
                                                        pager.add("\t\t" + "introduced in {mmodule.full_name}::{mclass}".gray)
                                                end
                                                for mclassdef in mclass.mclassdefs do