nitdoc: Use a fully qualified ID for classes.

Avoid conflict when two modules define two different classes with the
same name. This also permits to support classes generated implicitly by
`neo_doxygen`.

Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>

diff --git a/src/doc/doc_model.nit b/src/doc/doc_model.nit
index 288f2a5..12fbf72 100644 (file)
--- a/src/doc/doc_model.nit
+++ b/src/doc/doc_model.nit
@@ -247,7 +247,7 @@ 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_id do return "{intro_mmodule.nitdoc_id}__{name.to_cmangle}"
        redef fun nitdoc_url do return "class_{nitdoc_id}.html"
        redef fun mdoc do return intro.mdoc
 

diff --git a/tests/sav/nitdoc_args1.res b/tests/sav/nitdoc_args1.res
index 7b0f4e6..31ad44d 100644 (file)
--- a/tests/sav/nitdoc_args1.res
+++ b/tests/sav/nitdoc_args1.res
@@ -1,29 +1,29 @@
-class_module_0__Int.html
-class_module_0__Object.html
-class_module_0__Sys.html
-class_module_1__A.html
-class_module_1__B.html
+class_module_0__module_0__module_0__Int.html
+class_module_0__module_0__module_0__Object.html
+class_module_0__module_0__module_0__Sys.html
+class_module_1__module_1__module_1__A.html
+class_module_1__module_1__module_1__B.html
 css/
-dep_class_module_0__Int.dot
-dep_class_module_0__Int.map
-dep_class_module_0__Int.png
-dep_class_module_0__Int.s.dot
-dep_class_module_0__Object.dot
-dep_class_module_0__Object.map
-dep_class_module_0__Object.png
-dep_class_module_0__Object.s.dot
-dep_class_module_0__Sys.dot
-dep_class_module_0__Sys.map
-dep_class_module_0__Sys.png
-dep_class_module_0__Sys.s.dot
-dep_class_module_1__A.dot
-dep_class_module_1__A.map
-dep_class_module_1__A.png
-dep_class_module_1__A.s.dot
-dep_class_module_1__B.dot
-dep_class_module_1__B.map
-dep_class_module_1__B.png
-dep_class_module_1__B.s.dot
+dep_class_module_0__module_0__module_0__Int.dot
+dep_class_module_0__module_0__module_0__Int.map
+dep_class_module_0__module_0__module_0__Int.png
+dep_class_module_0__module_0__module_0__Int.s.dot
+dep_class_module_0__module_0__module_0__Object.dot
+dep_class_module_0__module_0__module_0__Object.map
+dep_class_module_0__module_0__module_0__Object.png
+dep_class_module_0__module_0__module_0__Object.s.dot
+dep_class_module_0__module_0__module_0__Sys.dot
+dep_class_module_0__module_0__module_0__Sys.map
+dep_class_module_0__module_0__module_0__Sys.png
+dep_class_module_0__module_0__module_0__Sys.s.dot
+dep_class_module_1__module_1__module_1__A.dot
+dep_class_module_1__module_1__module_1__A.map
+dep_class_module_1__module_1__module_1__A.png
+dep_class_module_1__module_1__module_1__A.s.dot
+dep_class_module_1__module_1__module_1__B.dot
+dep_class_module_1__module_1__module_1__B.map
+dep_class_module_1__module_1__module_1__B.png
+dep_class_module_1__module_1__module_1__B.s.dot
 dep_module_module_0__module_0__module_0.dot
 dep_module_module_0__module_0__module_0.map
 dep_module_module_0__module_0__module_0.png
@@ -39,16 +39,16 @@ js/
 less/
 module_module_0__module_0__module_0.html
 module_module_1__module_1__module_1.html
-property_module_0__Object__init.html
-property_module_0__Object__output.html
-property_module_0__Object__print.html
-property_module_0__Sys__main.html
-property_module_1__A__a1.html
-property_module_1__A__a12.html
-property_module_1__A__a123.html
-property_module_1__A__a13.html
-property_module_1__B__all2.html
-property_module_1__B__all25.html
+property_module_0__module_0__module_0__Object__init.html
+property_module_0__module_0__module_0__Object__output.html
+property_module_0__module_0__module_0__Object__print.html
+property_module_0__module_0__module_0__Sys__main.html
+property_module_1__module_1__module_1__A__a1.html
+property_module_1__module_1__module_1__A__a12.html
+property_module_1__module_1__module_1__A__a123.html
+property_module_1__module_1__module_1__A__a13.html
+property_module_1__module_1__module_1__B__all2.html
+property_module_1__module_1__module_1__B__all25.html
 quicksearch-list.js
 resources/
 search.html

diff --git a/tests/sav/nitdoc_args2.res b/tests/sav/nitdoc_args2.res
index 4f3456a..81006dd 100644 (file)
--- a/tests/sav/nitdoc_args2.res
+++ b/tests/sav/nitdoc_args2.res
@@ -1,39 +1,39 @@
-class_base_attr_nullable__Bar.html
-class_base_attr_nullable__Bool.html
-class_base_attr_nullable__Foo.html
-class_base_attr_nullable__Int.html
-class_base_attr_nullable__Integer.html
-class_base_attr_nullable__Object.html
-class_base_attr_nullable__Sys.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.html
 css/
-dep_class_base_attr_nullable__Bar.dot
-dep_class_base_attr_nullable__Bar.map
-dep_class_base_attr_nullable__Bar.png
-dep_class_base_attr_nullable__Bar.s.dot
-dep_class_base_attr_nullable__Bool.dot
-dep_class_base_attr_nullable__Bool.map
-dep_class_base_attr_nullable__Bool.png
-dep_class_base_attr_nullable__Bool.s.dot
-dep_class_base_attr_nullable__Foo.dot
-dep_class_base_attr_nullable__Foo.map
-dep_class_base_attr_nullable__Foo.png
-dep_class_base_attr_nullable__Foo.s.dot
-dep_class_base_attr_nullable__Int.dot
-dep_class_base_attr_nullable__Int.map
-dep_class_base_attr_nullable__Int.png
-dep_class_base_attr_nullable__Int.s.dot
-dep_class_base_attr_nullable__Integer.dot
-dep_class_base_attr_nullable__Integer.map
-dep_class_base_attr_nullable__Integer.png
-dep_class_base_attr_nullable__Integer.s.dot
-dep_class_base_attr_nullable__Object.dot
-dep_class_base_attr_nullable__Object.map
-dep_class_base_attr_nullable__Object.png
-dep_class_base_attr_nullable__Object.s.dot
-dep_class_base_attr_nullable__Sys.dot
-dep_class_base_attr_nullable__Sys.map
-dep_class_base_attr_nullable__Sys.png
-dep_class_base_attr_nullable__Sys.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.s.dot
 dep_module_base_attr_nullable__base_attr_nullable__base_attr_nullable.dot
 dep_module_base_attr_nullable__base_attr_nullable__base_attr_nullable.map
 dep_module_base_attr_nullable__base_attr_nullable__base_attr_nullable.png
@@ -43,19 +43,19 @@ index.html
 js/
 less/
 module_base_attr_nullable__base_attr_nullable__base_attr_nullable.html
-property_base_attr_nullable__Bar__a3.html
-property_base_attr_nullable__Foo__a1.html
-property_base_attr_nullable__Foo__a2.html
-property_base_attr_nullable__Foo__nop.html
-property_base_attr_nullable__Foo__run.html
-property_base_attr_nullable__Foo__run_other.html
-property_base_attr_nullable__Int___43d.html
-property_base_attr_nullable__Int__output.html
-property_base_attr_nullable__Integer__init.html
-property_base_attr_nullable__Integer__output.html
-property_base_attr_nullable__Integer__val.html
-property_base_attr_nullable__Object__init.html
-property_base_attr_nullable__Sys__main.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar__a3.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__a1.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__a2.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__nop.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__run.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__run_other.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int___43d.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int__output.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__init.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__output.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__val.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object__init.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys__main.html
 quicksearch-list.js
 resources/
 search.html

diff --git a/tests/sav/nitdoc_args3.res b/tests/sav/nitdoc_args3.res
index 1259409..df5e3da 100644 (file)
--- a/tests/sav/nitdoc_args3.res
+++ b/tests/sav/nitdoc_args3.res
@@ -1,39 +1,39 @@
-class_base_attr_nullable__Bar.html
-class_base_attr_nullable__Bool.html
-class_base_attr_nullable__Foo.html
-class_base_attr_nullable__Int.html
-class_base_attr_nullable__Integer.html
-class_base_attr_nullable__Object.html
-class_base_attr_nullable__Sys.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.html
+class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.html
 css/
-dep_class_base_attr_nullable__Bar.dot
-dep_class_base_attr_nullable__Bar.map
-dep_class_base_attr_nullable__Bar.png
-dep_class_base_attr_nullable__Bar.s.dot
-dep_class_base_attr_nullable__Bool.dot
-dep_class_base_attr_nullable__Bool.map
-dep_class_base_attr_nullable__Bool.png
-dep_class_base_attr_nullable__Bool.s.dot
-dep_class_base_attr_nullable__Foo.dot
-dep_class_base_attr_nullable__Foo.map
-dep_class_base_attr_nullable__Foo.png
-dep_class_base_attr_nullable__Foo.s.dot
-dep_class_base_attr_nullable__Int.dot
-dep_class_base_attr_nullable__Int.map
-dep_class_base_attr_nullable__Int.png
-dep_class_base_attr_nullable__Int.s.dot
-dep_class_base_attr_nullable__Integer.dot
-dep_class_base_attr_nullable__Integer.map
-dep_class_base_attr_nullable__Integer.png
-dep_class_base_attr_nullable__Integer.s.dot
-dep_class_base_attr_nullable__Object.dot
-dep_class_base_attr_nullable__Object.map
-dep_class_base_attr_nullable__Object.png
-dep_class_base_attr_nullable__Object.s.dot
-dep_class_base_attr_nullable__Sys.dot
-dep_class_base_attr_nullable__Sys.map
-dep_class_base_attr_nullable__Sys.png
-dep_class_base_attr_nullable__Sys.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bool.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object.s.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.dot
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.map
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.png
+dep_class_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys.s.dot
 dep_module_base_attr_nullable__base_attr_nullable__base_attr_nullable.dot
 dep_module_base_attr_nullable__base_attr_nullable__base_attr_nullable.map
 dep_module_base_attr_nullable__base_attr_nullable__base_attr_nullable.png
@@ -43,27 +43,27 @@ index.html
 js/
 less/
 module_base_attr_nullable__base_attr_nullable__base_attr_nullable.html
-property_base_attr_nullable__Bar___a3.html
-property_base_attr_nullable__Bar__a3.html
-property_base_attr_nullable__Bar__a3_61d.html
-property_base_attr_nullable__Foo___a1.html
-property_base_attr_nullable__Foo___a2.html
-property_base_attr_nullable__Foo__a1.html
-property_base_attr_nullable__Foo__a1_61d.html
-property_base_attr_nullable__Foo__a2.html
-property_base_attr_nullable__Foo__a2_61d.html
-property_base_attr_nullable__Foo__nop.html
-property_base_attr_nullable__Foo__run.html
-property_base_attr_nullable__Foo__run_other.html
-property_base_attr_nullable__Int___43d.html
-property_base_attr_nullable__Int__output.html
-property_base_attr_nullable__Integer___val.html
-property_base_attr_nullable__Integer__init.html
-property_base_attr_nullable__Integer__output.html
-property_base_attr_nullable__Integer__val.html
-property_base_attr_nullable__Integer__val_61d.html
-property_base_attr_nullable__Object__init.html
-property_base_attr_nullable__Sys__main.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar___a3.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar__a3.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Bar__a3_61d.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo___a1.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo___a2.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__a1.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__a1_61d.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__a2.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__a2_61d.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__nop.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__run.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Foo__run_other.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int___43d.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Int__output.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer___val.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__init.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__output.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__val.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Integer__val_61d.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Object__init.html
+property_base_attr_nullable__base_attr_nullable__base_attr_nullable__Sys__main.html
 quicksearch-list.js
 resources/
 search.html