@@ -19,6 +19,8 @@ import html.page.diagram.DiagramStats
1919trait DiagramDirectiveParser {
2020 this : ModelFactory with DiagramFactory with CommentFactory with TreeFactory =>
2121
22+ import this .global .definitions .AnyRefClass
23+
2224 // /// DIAGRAM FILTERS //////////////////////////////////////////////////////////////////////////////////////////////
2325
2426 /**
@@ -48,16 +50,22 @@ trait DiagramDirectiveParser {
4850 /** Hide subclasses (for type hierarchy diagrams) */
4951 def hideSubclasses : Boolean
5052 /** Show related classes from other objects/traits/packages (for content diagrams) */
51- def showInheritedNodes : Boolean
53+ def hideInheritedNodes : Boolean
5254 /** Hide a node from the diagram */
53- def hideNode (clazz : TemplateEntity ): Boolean
55+ def hideNode (clazz : Node ): Boolean
5456 /** Hide an edge from the diagram */
55- def hideEdge (clazz1 : TemplateEntity , clazz2 : TemplateEntity ): Boolean
57+ def hideEdge (clazz1 : Node , clazz2 : Node ): Boolean
5658 }
5759
5860 /** Main entry point into this trait: generate the filter for inheritance diagrams */
5961 def makeInheritanceDiagramFilter (template : DocTemplateImpl ): DiagramFilter = {
60- val defaultFilter = if (template.isClass || template.isTrait) FullDiagram else NoDiagramAtAll
62+
63+ val defaultFilter =
64+ if (template.isClass || template.isTrait || template.sym == AnyRefClass )
65+ FullDiagram
66+ else
67+ NoDiagramAtAll
68+
6169 if (template.comment.isDefined)
6270 makeDiagramFilter(template, template.comment.get.inheritDiagram, defaultFilter, true )
6371 else
@@ -83,9 +91,9 @@ trait DiagramDirectiveParser {
8391 val hideOutgoingImplicits : Boolean = false
8492 val hideSuperclasses : Boolean = false
8593 val hideSubclasses : Boolean = false
86- val showInheritedNodes : Boolean = false
87- def hideNode (clazz : TemplateEntity ): Boolean = false
88- def hideEdge (clazz1 : TemplateEntity , clazz2 : TemplateEntity ): Boolean = false
94+ val hideInheritedNodes : Boolean = false
95+ def hideNode (clazz : Node ): Boolean = false
96+ def hideEdge (clazz1 : Node , clazz2 : Node ): Boolean = false
8997 }
9098
9199 /** Hide the diagram completely, no need for special filtering */
@@ -95,9 +103,9 @@ trait DiagramDirectiveParser {
95103 val hideOutgoingImplicits : Boolean = true
96104 val hideSuperclasses : Boolean = true
97105 val hideSubclasses : Boolean = true
98- val showInheritedNodes : Boolean = false
99- def hideNode (clazz : TemplateEntity ): Boolean = true
100- def hideEdge (clazz1 : TemplateEntity , clazz2 : TemplateEntity ): Boolean = true
106+ val hideInheritedNodes : Boolean = true
107+ def hideNode (clazz : Node ): Boolean = true
108+ def hideEdge (clazz1 : Node , clazz2 : Node ): Boolean = true
101109 }
102110
103111 /** The AnnotationDiagramFilter trait directs the diagram engine according to an annotation
@@ -107,12 +115,18 @@ trait DiagramDirectiveParser {
107115 hideOutgoingImplicits : Boolean ,
108116 hideSuperclasses : Boolean ,
109117 hideSubclasses : Boolean ,
110- showInheritedNodes : Boolean ,
118+ hideInheritedNodes : Boolean ,
111119 hideNodesFilter : List [Pattern ],
112120 hideEdgesFilter : List [(Pattern , Pattern )]) extends DiagramFilter {
113121
114- def hideNode (clazz : TemplateEntity ): Boolean = {
115- val qualifiedName = clazz.qualifiedName
122+ private [this ] def getName (n : Node ): String =
123+ if (n.tpl.isDefined)
124+ n.tpl.get.qualifiedName
125+ else
126+ n.name
127+
128+ def hideNode (clazz : Node ): Boolean = {
129+ val qualifiedName = getName(clazz)
116130 for (hideFilter <- hideNodesFilter)
117131 if (hideFilter.matcher(qualifiedName).matches) {
118132 // println(hideFilter + ".matcher(" + qualifiedName + ").matches = " + hideFilter.matcher(qualifiedName).matches)
@@ -121,9 +135,9 @@ trait DiagramDirectiveParser {
121135 false
122136 }
123137
124- def hideEdge (clazz1 : TemplateEntity , clazz2 : TemplateEntity ): Boolean = {
125- val clazz1Name = clazz1.qualifiedName
126- val clazz2Name = clazz2.qualifiedName
138+ def hideEdge (clazz1 : Node , clazz2 : Node ): Boolean = {
139+ val clazz1Name = getName( clazz1)
140+ val clazz2Name = getName( clazz2)
127141 for ((clazz1Filter, clazz2Filter) <- hideEdgesFilter) {
128142 if (clazz1Filter.matcher(clazz1Name).matches &&
129143 clazz2Filter.matcher(clazz2Name).matches) {
@@ -162,7 +176,7 @@ trait DiagramDirectiveParser {
162176 var hideOutgoingImplicits0 : Boolean = false
163177 var hideSuperclasses0 : Boolean = false
164178 var hideSubclasses0 : Boolean = false
165- var showInheritedNodes0 : Boolean = false
179+ var hideInheritedNodes0 : Boolean = false
166180 var hideNodesFilter0 : List [Pattern ] = Nil
167181 var hideEdgesFilter0 : List [(Pattern , Pattern )] = Nil
168182
@@ -190,8 +204,8 @@ trait DiagramDirectiveParser {
190204 hideSuperclasses0 = true
191205 case " hideSubclasses" if isInheritanceDiagram =>
192206 hideSubclasses0 = true
193- case " showInheritedNodes " if ! isInheritanceDiagram =>
194- showInheritedNodes0 = true
207+ case " hideInheritedNodes " if ! isInheritanceDiagram =>
208+ hideInheritedNodes0 = true
195209 case HideNodesRegex (last) =>
196210 val matcher = NodeSpecPattern .matcher(entry)
197211 while (matcher.find()) {
@@ -225,7 +239,7 @@ trait DiagramDirectiveParser {
225239 (hideOutgoingImplicits0 == false ) &&
226240 (hideSuperclasses0 == false ) &&
227241 (hideSubclasses0 == false ) &&
228- (showInheritedNodes0 == false ) &&
242+ (hideInheritedNodes0 == false ) &&
229243 (hideDiagram0 == false ))
230244 FullDiagram
231245 else
@@ -235,7 +249,7 @@ trait DiagramDirectiveParser {
235249 hideOutgoingImplicits = hideOutgoingImplicits0,
236250 hideSuperclasses = hideSuperclasses0,
237251 hideSubclasses = hideSubclasses0,
238- showInheritedNodes = showInheritedNodes0 ,
252+ hideInheritedNodes = hideInheritedNodes0 ,
239253 hideNodesFilter = hideNodesFilter0,
240254 hideEdgesFilter = hideEdgesFilter0)
241255
0 commit comments