ni_nitdoc: filtered Object properties from toplevel properties

[nit.git] / src / ni_nitdoc.nit

diff --git a/src/ni_nitdoc.nit b/src/ni_nitdoc.nit
index ee20484..43a3aae 100644 (file)
--- a/src/ni_nitdoc.nit
+++ b/src/ni_nitdoc.nit
@@ -154,11 +154,16 @@ class Nitdoc
                        content.append("\{txt: \"{mclass.name}\", url:\"{mclass.url}\" \},")
                        content.append("],")
                end
+               var name2mprops = new HashMap[String, Set[MPropDef]]
                for mproperty in model.mproperties do
                        if mproperty.visibility <= none_visibility then continue
                        if mproperty isa MAttribute then continue
-                       content.append("\"{mproperty.name}\": [")
-                       for mpropdef in mproperty.mpropdefs do
+                       if not name2mprops.has_key(mproperty.name) then name2mprops[mproperty.name] = new HashSet[MPropDef]
+                       name2mprops[mproperty.name].add_all(mproperty.mpropdefs)
+               end
+               for mproperty, mpropdefs in name2mprops do
+                       content.append("\"{mproperty}\": [")
+                       for mpropdef in mpropdefs do
                                content.append("\{txt: \"{mpropdef.full_name}\", url:\"{mpropdef.url}\" \},")
                        end
                        content.append("],")
@@ -734,7 +739,7 @@ class NitdocClass
                        append("<h4>Methods</h4>")
                        append("<ul>")
                        for mprop in mts do
-                               if mprop.mproperty.intro_mclassdef.mclass.name == "Object" then continue
+                               if mclass.name != "Object" and mprop.mproperty.intro_mclassdef.mclass.name == "Object" and mprop.mproperty.visibility <= protected_visibility then continue
                                append(mprop.html_sidebar_item(self))
                        end
                        append("</ul>")