friend table templates include qualified name

#feat

Author: alandefreitas

share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs

@@ -83,7 +83,7 @@
 | Description
 {{#each symbol.friends }}
 {{#if symbol}}
-| {{#>markup/code}}{{> symbol/name symbol link=symbol }}{{/markup/code}}
+| {{#>markup/code}}{{> symbol/qualified-name symbol link=symbol }}{{/markup/code}}
 | {{> javadoc/inline-brief symbol.doc.brief }}
 {{else}}
 | {{#>markup/code}}{{> type/declarator type }}{{/markup/code}}

share/mrdocs/addons/generator/common/partials/symbol/qualified-name.hbs

@@ -18,30 +18,20 @@
     See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
 --}}
 {{! We remove whitespace between all tag so the result is in a single line ~}}
-{{~#if (ne kind "friend")~}}
-    {{~#if name~}}
-        {{! General case: linked parent symbols followed by the symbol name ~}}
-        {{#each parents~}}
-            {{#if name~}}
-                {{>symbol/name . link=. nolink=../nolink}}::
-            {{~/if}}
-        {{~/each}}{{>symbol/name .}}
-    {{~else~}}
-        {{! Unnamed symbol: use the symbol type in the title ~}}
-        {{~#if parent~}}
-            {{! Symbol with no name but with a parent ~}}
-            Unnamed
-        {{~else~}}
-            {{! Symbol with no name and no parent: Global symbol ~}}
-            Global
-        {{~/if}} {{or tag kind~}}
-    {{~/if~}}
+{{~#if name~}}
+    {{! General case: linked parent symbols followed by the symbol name ~}}
+    {{#each parents~}}
+        {{#if name~}}
+            {{>symbol/name . link=. nolink=../nolink}}::
+        {{~/if}}
+    {{~/each}}{{>symbol/name .}}
 {{~else~}}
-    {{~#if symbol~}}
-        {{! Friend symbol: use the befriended symbol ~}}
-        {{>symbol/qualified-name symbol nolink=nolink ~}}
+    {{! Unnamed symbol: use the symbol type in the title ~}}
+    {{~#if parent~}}
+        {{! Symbol with no name but with a parent ~}}
+        Unnamed
     {{~else~}}
-        {{! Friend type: use the type name ~}}
-        {{~>type/declarator type ~}}
-    {{~/if~}}
+        {{! Symbol with no name and no parent: Global symbol ~}}
+        Global
+    {{~/if}} {{or tag kind~}}
 {{~/if~}}

test-files/golden-tests/symbols/overloads/overloads-ostream.adoc

@@ -199,7 +199,7 @@ class B;
 |===
 | Name
 | Description
-| `<<ostream-operator_lshift-0d,operator&lt;&lt;>>`
+| `<<ostream,ostream>>::<<ostream-operator_lshift-0d,operator&lt;&lt;>>`
 | Stream insertion operator
 |===
 

test-files/golden-tests/symbols/record/friend-2.adoc renamed to test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc

@@ -27,7 +27,7 @@
 
 === Synopsis
 
-Declared in `<friend‐2.cpp>`
+Declared in `<friend‐fn‐has‐docs.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ f
 
 === Synopsis
 
-Declared in `<friend‐2.cpp>`
+Declared in `<friend‐fn‐has‐docs.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----

test-files/golden-tests/symbols/record/friend-2.cpp renamed to test-files/golden-tests/symbols/record/friend-fn-has-docs.cpp

@@ -0,0 +1,16 @@
+struct X
+{
+    X();
+    ~X();
+    /// Friend member-function
+    /// @param i
+    /// @return char*
+    char* foo(int i);
+};
+
+struct U
+{
+    friend X::X();
+    friend X::~X();
+    friend char* X::foo(int);
+};

test-files/golden-tests/symbols/record/friend-2.html renamed to test-files/golden-tests/symbols/record/friend-fn-has-docs.html

@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in `<friend‐4.cpp>`
+Declared in `<friend‐fn‐multi‐2nd.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct T;
 
 === Synopsis
 
-Declared in `<friend‐4.cpp>`
+Declared in `<friend‐fn‐multi‐2nd.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ U::f
 
 === Synopsis
 
-Declared in `<friend‐4.cpp>`
+Declared in `<friend‐fn‐multi‐2nd.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----

test-files/golden-tests/symbols/record/friend-2.xml renamed to test-files/golden-tests/symbols/record/friend-fn-has-docs.xml

@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in `<friend‐5.cpp>`
+Declared in `<friend‐fn‐multi‐free.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct T;
 
 === Synopsis
 
-Declared in `<friend‐5.cpp>`
+Declared in `<friend‐fn‐multi‐free.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ f
 
 === Synopsis
 
-Declared in `<friend‐5.cpp>`
+Declared in `<friend‐fn‐multi‐free.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----

test-files/golden-tests/symbols/record/friend-fn-member.cpp

@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in `<friend‐3.cpp>`
+Declared in `<friend‐fn‐multi.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct T;
 
 === Synopsis
 
-Declared in `<friend‐3.cpp>`
+Declared in `<friend‐fn‐multi.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ T::f
 
 === Synopsis
 
-Declared in `<friend‐3.cpp>`
+Declared in `<friend‐fn‐multi.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----

test-files/golden-tests/symbols/record/friend-4.adoc renamed to test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc

@@ -27,7 +27,7 @@
 
 === Synopsis
 
-Declared in `<friend‐1.cpp>`
+Declared in `<friend‐fn.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ f
 
 === Synopsis
 
-Declared in `<friend‐1.cpp>`
+Declared in `<friend‐fn.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----

test-files/golden-tests/symbols/record/friend-4.cpp renamed to test-files/golden-tests/symbols/record/friend-fn-multi-2nd.cpp

@@ -27,7 +27,7 @@ Struct T brief
 
 === Synopsis
 
-Declared in `<friend‐6.cpp>`
+Declared in `<friend‐type.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ Struct U brief
 
 === Synopsis
 
-Declared in `<friend‐6.cpp>`
+Declared in `<friend‐type.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ Struct V brief
 
 === Synopsis
 
-Declared in `<friend‐6.cpp>`
+Declared in `<friend‐type.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -99,7 +99,7 @@ Friend class Z brief
 
 === Synopsis
 
-Declared in `<friend‐6.cpp>`
+Declared in `<friend‐type.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----