nitdoc: better display of concerns
[nit.git] / src / doc / doc_model.nit
index 2efa7c4..d460f07 100644 (file)
@@ -19,6 +19,7 @@ import model_utils
 import modelize_property
 import markdown
 import doc_templates
+import ordered_tree
 
 redef class MDoc
        # Comment synopsys HTML escaped
@@ -48,17 +49,47 @@ redef class MEntity
        # HTML Escaped name
        fun nitdoc_name: String is abstract
 
-       # HTML anchor to this entity in a nitdoc page
-       fun nitdoc_anchor: String is abstract
+       # Used as HTML unique ids
+       fun nitdoc_id: String is abstract
 
        # URL of this entity Nitdoc page
        fun nitdoc_url: String is abstract
 
        # A template link to the mentity `nitdoc_anchor`
-       fun tpl_anchor: TplLink is abstract
+       fun tpl_anchor: TplLink do
+               var tpl = new TplLink("#{nitdoc_id}", nitdoc_name)
+               if mdoc != null then
+                       tpl.title = mdoc.short_comment
+               end
+               return tpl
+       end
 
        # A template link to the mentity `nitdoc_url`
-       fun tpl_link: TplLink is abstract
+       fun tpl_link: TplLink do
+               var tpl = new TplLink(nitdoc_url, nitdoc_name)
+               if mdoc != null then
+                       tpl.title = mdoc.short_comment
+               end
+               return tpl
+       end
+
+       # A template article that briefly describe the entity
+       fun tpl_short_article: TplArticle do
+               var tpl = tpl_article
+               if mdoc != null then
+                       tpl.content = mdoc.tpl_short_comment
+               end
+               return tpl
+       end
+
+       # A template article that describe the entity
+       fun tpl_article: TplArticle do
+               var tpl = new TplArticle.with_title(nitdoc_id, tpl_title)
+               tpl.title_classes.add "signature"
+               tpl.subtitle = tpl_namespace
+               tpl.summary_title = nitdoc_name
+               return tpl
+       end
 
        # A template signature that contains modifiers and parameters
        fun tpl_declaration: Template is abstract
@@ -69,41 +100,60 @@ redef class MEntity
        # A template definition of the mentity
        # include name, sysnopsys, comment and namespace
        fun tpl_definition: TplDefinition is abstract
-end
 
-redef class MProject
-       fun nitdoc_mdoc: nullable MDoc do
-               if mdoc != null then return mdoc
-               if root == null then return null
-               if root.mdoc != null then return root.mdoc
-               if not root.mmodules.is_empty then return root.mmodules.first.mdoc
-               return null
+       # A li element that can go in a list
+       fun tpl_list_item: TplListItem do
+               var lnk = new Template
+               lnk.add new TplLabel.with_classes(tpl_css_classes)
+               lnk.add tpl_link
+               if mdoc != null then
+                       lnk.add ": "
+                       lnk.add mdoc.short_comment
+               end
+               return new TplListItem.with_content(lnk)
        end
 
-       redef fun nitdoc_name do return name.html_escape
-       redef fun nitdoc_anchor do return "PRJ_{nitdoc_name}"
+       fun tpl_css_classes: Array[String] is abstract
 
-       redef fun nitdoc_url do
-               if root != null and not root.mmodules.is_empty then return root.mmodules.first.nitdoc_url
-               return "project_{name}.html"
+       # Box title for this mentity
+       fun tpl_title: Template do
+               var title = new Template
+               title.add tpl_icon
+               title.add tpl_namespace
+               return title
        end
 
-       redef fun tpl_anchor do
-               var tpl = new TplLink("#{nitdoc_anchor}", nitdoc_name)
-               var mdoc = nitdoc_mdoc
+       # Icon that will be displayed before the title
+       fun tpl_icon: TplIcon do
+               var icon = new TplIcon.with_icon("tag")
+               icon.css_classes.add_all(tpl_css_classes)
+               return icon
+       end
+end
+
+redef class MConcern
+       # Return a li element for `self` that can be displayed in a concern list
+       private fun tpl_concern_item: TplListItem do
+               var lnk = new Template
+               lnk.add tpl_anchor
                if mdoc != null then
-                       tpl.title = mdoc.short_comment
+                       lnk.add ": "
+                       lnk.add mdoc.short_comment
                end
-               return tpl
+               return new TplListItem.with_content(lnk)
        end
+end
 
-       redef fun tpl_link do
-               var tpl = new TplLink(nitdoc_url, nitdoc_name)
-               var mdoc = nitdoc_mdoc
-               if mdoc != null then
-                       tpl.title = mdoc.short_comment
+redef class MProject
+       redef fun nitdoc_name do return name.html_escape
+       redef fun nitdoc_id do return nitdoc_name
+       redef fun nitdoc_url do return "project_{name}.html"
+
+       redef fun mdoc do
+               if root != null then
+                       return root.mdoc
                end
-               return tpl
+               return super
        end
 
        redef fun tpl_declaration do
@@ -118,55 +168,73 @@ redef class MProject
 
        redef fun tpl_definition do
                var tpl = new TplDefinition
-               tpl.namespace = tpl_namespace
-               var mdoc = nitdoc_mdoc
                if mdoc != null then
                        tpl.comment = mdoc.tpl_comment
                end
                return tpl
        end
 
-       fun tpl_article: TplArticle do
-               var article = new TplArticle.with_title(nitdoc_anchor, tpl_link)
-               article.title_classes.add "signature"
-               article.subtitle = tpl_declaration
-               article.summary_title = nitdoc_name
-               article.content = tpl_definition
-               return article
-       end
+       redef fun tpl_css_classes do return ["public"]
 end
 
 redef class MGroup
-       redef fun tpl_link do return mmodules.first.tpl_link
+       redef fun nitdoc_name do return name.html_escape
+
+       redef fun nitdoc_id do
+               if parent != null then
+                       return "{parent.nitdoc_id}__{nitdoc_name}"
+               end
+               return "{mproject.nitdoc_id}__{nitdoc_name}"
+       end
+
+       redef fun nitdoc_url do return "group_{name}.html"
 
        redef fun tpl_namespace do
-               if mproject == null then return tpl_link
-               if mproject.root != self then
-                       var tpl = new Template
+               var tpl = new Template
+               if mproject != null then
                        tpl.add mproject.tpl_namespace
+               else if parent != null then
+                       tpl.add parent.tpl_namespace
+               end
+               if mproject != null and mproject.root != self then
                        tpl.add "::"
-                       tpl.add self.tpl_link
-                       return tpl
-               else
-                       return mproject.tpl_namespace
+                       tpl.add tpl_link
+               end
+               return tpl
+       end
+
+       redef fun tpl_declaration do
+               var tpl = new Template
+               tpl.add "<span>group "
+               tpl.add tpl_link
+               tpl.add "</span>"
+               return tpl
+       end
+
+       redef fun tpl_definition do
+               var tpl = new TplDefinition
+               if mdoc != null then
+                       tpl.comment = mdoc.tpl_comment
                end
+               return tpl
        end
+
+       redef fun tpl_css_classes do return ["public"]
 end
 
 redef class MModule
        # Is the mmodule created by nitdoc for internal purpose?
        var is_fictive: Bool writable = false
 
-       # Full namespace of this module
-       fun full_namespace: String do
-               if public_owner != null then
-                       return "{public_owner.nitdoc_name}::{nitdoc_name}"
+       redef fun nitdoc_name do return name.html_escape
+
+       redef fun nitdoc_id do
+               if mgroup != null then
+                       return "{mgroup.nitdoc_id}__{nitdoc_name}"
                end
                return nitdoc_name
        end
 
-       redef fun nitdoc_name do return name.html_escape
-
        redef fun nitdoc_url do
                var res = new FlatBuffer
                res.append("module_")
@@ -178,124 +246,70 @@ redef class MModule
                return res.to_s
        end
 
-       redef fun nitdoc_anchor: String do
-               var res = new FlatBuffer
-               res.append("MOD_")
-               var mowner = public_owner
-               if mowner != null then
-                       res.append("{public_owner.nitdoc_name}_")
-               end
-               res.append(nitdoc_name)
-               return res.to_s
-       end
-
-       redef fun tpl_anchor do
-               var tpl = new TplLink("#{nitdoc_anchor}", nitdoc_name)
-               if mdoc != null then
-                       tpl.title = mdoc.short_comment
-               end
-               return tpl
-       end
-
-       redef fun tpl_link do
-               var tpl = new TplLink(nitdoc_url, nitdoc_name)
-               if mdoc != null then
-                       tpl.title = mdoc.short_comment
-               end
-               return tpl
-       end
-
        redef fun tpl_declaration do
                var tpl = new Template
                tpl.add "<span>module "
-               tpl.add tpl_namespace
+               tpl.add tpl_link
                tpl.add "</span>"
                return tpl
        end
 
        redef fun tpl_namespace do
                var tpl = new Template
-               if mgroup != null and mgroup.mmodules.first != self then
+               if mgroup != null then
                        tpl.add mgroup.tpl_namespace
                        tpl.add "::"
                end
-               tpl.add "<span>"
                tpl.add tpl_link
-               tpl.add "</span>"
                return tpl
        end
 
        redef fun tpl_definition do
-               var tpl = new TplDefinition
-               tpl.namespace = tpl_namespace
+               var tpl = new TplClassDefinition
                if mdoc != null then
                        tpl.comment = mdoc.tpl_comment
                end
                return tpl
        end
 
-       fun tpl_article: TplArticle do
-               var article = new TplArticle.with_title(nitdoc_anchor, tpl_link)
-               article.title_classes.add "signature"
-               article.subtitle = tpl_declaration
-               article.summary_title = nitdoc_name
-               article.content = tpl_definition
-               return article
+       redef fun tpl_title do
+               var title = new Template
+               title.add tpl_icon
+               title.add tpl_namespace
+               return title
        end
 
-       fun tpl_list_item: TplListItem do
-               var lnk = new Template
-               lnk.add tpl_link
-               if mdoc != null then
-                       lnk.add ": "
-                       lnk.add mdoc.short_comment
-               end
-               return new TplListItem.with_content(lnk)
-       end
+       redef fun tpl_css_classes do return ["public"]
 end
 
 redef class MClass
        redef fun nitdoc_name do return name.html_escape
+       redef fun nitdoc_id do return "{intro_mmodule.mgroup.mproject}__{name.to_cmangle}"
        redef fun nitdoc_url do return "class_{public_owner}_{name}.html"
-       redef fun nitdoc_anchor do return "CLASS_{public_owner.nitdoc_name}_{nitdoc_name}"
 
-       redef fun tpl_anchor do
-               var tpl = new TplLink("#{nitdoc_anchor}", nitdoc_name)
-               if intro.mdoc != null then
-                       tpl.title = intro.mdoc.short_comment
-               end
-               return tpl
-       end
-
-       redef fun tpl_link do
-               var tpl = new TplLink(nitdoc_url, nitdoc_name)
-               if intro.mdoc != null then
-                       tpl.title = intro.mdoc.short_comment
-               end
-               return tpl
-       end
+       redef fun mdoc do return intro.mdoc
 
        redef fun tpl_declaration do return intro.tpl_declaration
 
        redef fun tpl_namespace do
                var tpl = new Template
-               tpl.add intro_mmodule.tpl_namespace
+               tpl.add intro_mmodule.mgroup.mproject.tpl_namespace
                tpl.add "::<span>"
                tpl.add tpl_link
                tpl.add "</span>"
                return tpl
        end
 
-       fun tpl_list_item: TplListItem do
-               var lnk = new Template
-               lnk.add tpl_link
-               if intro.mdoc != null then
-                       lnk.add ": "
-                       lnk.add intro.mdoc.short_comment
-               end
-               return new TplListItem.with_content(lnk)
+       redef fun tpl_title do
+               var title = new Template
+               title.add tpl_icon
+               title.add tpl_link
+               title.add tpl_signature
+               return title
        end
 
+       redef fun tpl_icon do return intro.tpl_icon
+
        fun tpl_signature: Template do
                var tpl = new Template
                if arity > 0 then
@@ -305,12 +319,20 @@ redef class MClass
                end
                return tpl
        end
+
+       redef fun tpl_article do
+               var tpl = super
+               tpl.summary_title = "{nitdoc_name}{tpl_signature.write_to_string}"
+               return tpl
+       end
+
+       redef fun tpl_css_classes do return intro.tpl_css_classes
 end
 
 redef class MClassDef
        redef fun nitdoc_name do return mclass.nitdoc_name
-
-       redef fun tpl_link do return mclass.tpl_link
+       redef fun nitdoc_id do return "{mmodule.nitdoc_id}__{name.to_cmangle}"
+       redef fun nitdoc_url do return "{mclass.nitdoc_url}#{nitdoc_id}"
 
        redef fun tpl_namespace do
                var tpl = new Template
@@ -321,6 +343,29 @@ redef class MClassDef
                return tpl
        end
 
+       redef fun tpl_article do
+               var tpl = new TplArticle(nitdoc_id)
+               tpl.summary_title = "in {mmodule.nitdoc_name}"
+               tpl.title = tpl_declaration
+               tpl.title_classes.add "signature"
+               var title = new Template
+               title.add "in "
+               title.add mmodule.tpl_namespace
+               tpl.subtitle = title
+               if mdoc != null then
+                       tpl.content = mdoc.tpl_comment
+               end
+               return tpl
+       end
+
+       redef fun tpl_title do
+               var title = new Template
+               title.add tpl_icon
+               title.add tpl_link
+               title.add tpl_signature
+               return title
+       end
+
        redef fun tpl_declaration do
                var tpl = new Template
                tpl.add tpl_modifiers
@@ -352,12 +397,12 @@ redef class MClassDef
                return tpl
        end
 
-       fun tpl_css_classes: Set[String] do
+       redef fun tpl_css_classes do
                var set = new HashSet[String]
                if is_intro then set.add "intro"
                set.add_all mclass.intro.modifiers
                set.add_all modifiers
-               return set
+               return set.to_a
        end
 
        fun tpl_modifiers: Template do
@@ -368,10 +413,48 @@ redef class MClassDef
                end
                return tpl
        end
+
+       redef fun tpl_list_item do
+               var lnk = new Template
+               lnk.add new TplLabel.with_classes(tpl_css_classes)
+               lnk.add tpl_link
+               if mdoc != null then
+                       lnk.add ": "
+                       lnk.add mdoc.short_comment
+               else if mclass.intro.mdoc != null then
+                       lnk.add ": "
+                       lnk.add mclass.intro.mdoc.short_comment
+               end
+               return new TplListItem.with_content(lnk)
+       end
+
+       redef fun tpl_anchor: TplLink do
+               var tpl = new TplLink("#{nitdoc_id}", nitdoc_name)
+               if mdoc != null then
+                       tpl.title = mdoc.short_comment
+               else if mclass.intro.mdoc != null then
+                       tpl.title = mclass.intro.mdoc.short_comment
+               end
+               return tpl
+       end
+
+       redef fun tpl_link: TplLink do
+               var tpl = new TplLink(nitdoc_url, nitdoc_name)
+               if mdoc != null then
+                       tpl.title = mdoc.short_comment
+               else if mclass.intro.mdoc != null then
+                       tpl.title = mclass.intro.mdoc.short_comment
+               end
+               return tpl
+       end
 end
 
 redef class MProperty
        redef fun nitdoc_name do return name.html_escape
+       redef fun nitdoc_id do return "{intro_mclassdef.mclass.nitdoc_id}__{name.to_cmangle}"
+       redef fun nitdoc_url do return "proprety_{nitdoc_id}.html"
+
+       redef fun mdoc do return intro.mdoc
 
        redef fun tpl_namespace do
                var tpl = new Template
@@ -385,26 +468,34 @@ redef class MProperty
        redef fun tpl_declaration do return intro.tpl_declaration
 
        fun tpl_signature: Template do return new Template
+
+       redef fun tpl_title do return intro.tpl_title
+
+       redef fun tpl_icon do return intro.tpl_icon
+
+       redef fun tpl_css_classes do return intro.tpl_css_classes
 end
 
 redef class MPropDef
-       redef fun nitdoc_url do return "{mclassdef.mclass.nitdoc_url}#{nitdoc_anchor}"
+       redef fun nitdoc_name do return mproperty.nitdoc_name
+       redef fun nitdoc_id do return "{mclassdef.nitdoc_id}__{name.to_cmangle}"
+       redef fun nitdoc_url do return "{mproperty.nitdoc_url}#{nitdoc_id}"
 
-       redef fun nitdoc_anchor do
-               return "PROP_{mclassdef.mclass.public_owner.nitdoc_name}_{mproperty.name.to_cmangle}"
-       end
-
-       redef fun tpl_anchor do
-               var tpl = new TplLink("#{nitdoc_anchor}", mproperty.nitdoc_name)
-               if mproperty.intro.mdoc != null then
+       redef fun tpl_anchor: TplLink do
+               var tpl = new TplLink("#{nitdoc_id}", nitdoc_name)
+               if mdoc != null then
+                       tpl.title = mdoc.short_comment
+               else if mproperty.intro.mdoc != null then
                        tpl.title = mproperty.intro.mdoc.short_comment
                end
                return tpl
        end
 
-       redef fun tpl_link do
-               var tpl = new TplLink(nitdoc_url, mproperty.nitdoc_name)
-               if mproperty.intro.mdoc != null then
+       redef fun tpl_link: TplLink do
+               var tpl = new TplLink(nitdoc_url, nitdoc_name)
+               if mdoc != null then
+                       tpl.title = mdoc.short_comment
+               else if mproperty.intro.mdoc != null then
                        tpl.title = mproperty.intro.mdoc.short_comment
                end
                return tpl
@@ -418,6 +509,28 @@ redef class MPropDef
                return tpl
        end
 
+       redef fun tpl_article do
+               var tpl = new TplArticle(nitdoc_id)
+               tpl.summary_title = "in {mclassdef.nitdoc_name}"
+               var title = new Template
+               title.add "in "
+               title.add mclassdef.tpl_link
+               tpl.title = title
+               tpl.subtitle = tpl_declaration
+               if mdoc != null then
+                       tpl.content = mdoc.tpl_comment
+               end
+               return tpl
+       end
+
+       redef fun tpl_title do
+               var title = new Template
+               title.add tpl_icon
+               title.add tpl_link
+               title.add tpl_signature
+               return title
+       end
+
        redef fun tpl_definition do
                var tpl = new TplDefinition
                tpl.namespace = mclassdef.tpl_namespace
@@ -435,12 +548,12 @@ redef class MPropDef
                return tpl
        end
 
-       fun tpl_css_classes: Set[String] do
+       redef fun tpl_css_classes do
                var set = new HashSet[String]
                if is_intro then set.add "intro"
                set.add_all mproperty.intro.modifiers
                set.add_all modifiers
-               return set
+               return set.to_a
        end
 
        fun tpl_modifiers: Template do
@@ -453,6 +566,20 @@ redef class MPropDef
        end
 
        fun tpl_signature: Template do return new Template
+
+       redef fun tpl_list_item do
+               var lnk = new Template
+               lnk.add new TplLabel.with_classes(tpl_css_classes.to_a)
+               lnk.add tpl_link
+               if mdoc != null then
+                       lnk.add ": "
+                       lnk.add mdoc.short_comment
+               else if mproperty.intro.mdoc != null then
+                       lnk.add ": "
+                       lnk.add mproperty.intro.mdoc.short_comment
+               end
+               return new TplListItem.with_content(lnk)
+       end
 end
 
 redef class MMethod
@@ -563,3 +690,39 @@ redef class MParameter
        end
 end
 
+redef class ConcernsTree
+
+       private var seen = new HashSet[MConcern]
+
+       redef fun add(p, e) do
+               if seen.has(e) then return
+               seen.add e
+               super(p, e)
+       end
+
+       fun to_tpl: TplList do
+               var lst = new TplList.with_classes(["list-unstyled", "list-definition"])
+               for r in roots do
+                       var li = r.tpl_concern_item
+                       lst.add_li li
+                       build_list(r, li)
+               end
+               return lst
+       end
+
+       private fun build_list(e: MConcern, li: TplListItem) do
+               if not sub.has_key(e) then return
+               var subs = sub[e]
+               var lst = new TplList.with_classes(["list-unstyled", "list-definition"])
+               for e2 in subs do
+                       if e2 isa MGroup and e2.is_root then
+                               build_list(e2, li)
+                       else
+                               var sli = e2.tpl_concern_item
+                               lst.add_li sli
+                               build_list(e2, sli)
+                       end
+               end
+               li.append lst
+       end
+end