nitdoc: Shorten redundant IDs.

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 c58cb74..c25c7dc 100644 (file)
--- a/src/doc/doc_model.nit
+++ b/src/doc/doc_model.nit
@@ -217,7 +217,11 @@ redef class MModule
 
        redef var nitdoc_id is lazy do
                if mgroup != null then
-                       return "{mgroup.nitdoc_id}__{name.to_cmangle}"
+                       if mgroup.mmodules.length == 1 then
+                               return "{mgroup.nitdoc_id}-"
+                       else
+                               return "{mgroup.nitdoc_id}__{name.to_cmangle}"
+                       end
                end
                return name.to_cmangle
        end

diff --git a/tests/sav/nitdoc_args1.res b/tests/sav/nitdoc_args1.res
index 5a7edbc..1e781d9 100644 (file)
--- a/tests/sav/nitdoc_args1.res
+++ b/tests/sav/nitdoc_args1.res
@@ -1,54 +1,54 @@
-class_module_95d0__module_95d0__Int.html
-class_module_95d0__module_95d0__Object.html
-class_module_95d0__module_95d0__Sys.html
-class_module_95d1__module_95d1__A.html
-class_module_95d1__module_95d1__B.html
+class_module_95d0-__Int.html
+class_module_95d0-__Object.html
+class_module_95d0-__Sys.html
+class_module_95d1-__A.html
+class_module_95d1-__B.html
 css/
-dep_class_module_95d0__module_95d0__Int.dot
-dep_class_module_95d0__module_95d0__Int.map
-dep_class_module_95d0__module_95d0__Int.png
-dep_class_module_95d0__module_95d0__Int.s.dot
-dep_class_module_95d0__module_95d0__Object.dot
-dep_class_module_95d0__module_95d0__Object.map
-dep_class_module_95d0__module_95d0__Object.png
-dep_class_module_95d0__module_95d0__Object.s.dot
-dep_class_module_95d0__module_95d0__Sys.dot
-dep_class_module_95d0__module_95d0__Sys.map
-dep_class_module_95d0__module_95d0__Sys.png
-dep_class_module_95d0__module_95d0__Sys.s.dot
-dep_class_module_95d1__module_95d1__A.dot
-dep_class_module_95d1__module_95d1__A.map
-dep_class_module_95d1__module_95d1__A.png
-dep_class_module_95d1__module_95d1__A.s.dot
-dep_class_module_95d1__module_95d1__B.dot
-dep_class_module_95d1__module_95d1__B.map
-dep_class_module_95d1__module_95d1__B.png
-dep_class_module_95d1__module_95d1__B.s.dot
-dep_module_module_95d0__module_95d0.dot
-dep_module_module_95d0__module_95d0.map
-dep_module_module_95d0__module_95d0.png
-dep_module_module_95d0__module_95d0.s.dot
-dep_module_module_95d1__module_95d1.dot
-dep_module_module_95d1__module_95d1.map
-dep_module_module_95d1__module_95d1.png
-dep_module_module_95d1__module_95d1.s.dot
+dep_class_module_95d0-__Int.dot
+dep_class_module_95d0-__Int.map
+dep_class_module_95d0-__Int.png
+dep_class_module_95d0-__Int.s.dot
+dep_class_module_95d0-__Object.dot
+dep_class_module_95d0-__Object.map
+dep_class_module_95d0-__Object.png
+dep_class_module_95d0-__Object.s.dot
+dep_class_module_95d0-__Sys.dot
+dep_class_module_95d0-__Sys.map
+dep_class_module_95d0-__Sys.png
+dep_class_module_95d0-__Sys.s.dot
+dep_class_module_95d1-__A.dot
+dep_class_module_95d1-__A.map
+dep_class_module_95d1-__A.png
+dep_class_module_95d1-__A.s.dot
+dep_class_module_95d1-__B.dot
+dep_class_module_95d1-__B.map
+dep_class_module_95d1-__B.png
+dep_class_module_95d1-__B.s.dot
+dep_module_module_95d0-.dot
+dep_module_module_95d0-.map
+dep_module_module_95d0-.png
+dep_module_module_95d0-.s.dot
+dep_module_module_95d1-.dot
+dep_module_module_95d1-.map
+dep_module_module_95d1-.png
+dep_module_module_95d1-.s.dot
 group_module_95d0.html
 group_module_95d1.html
 index.html
 js/
 less/
-module_module_95d0__module_95d0.html
-module_module_95d1__module_95d1.html
-property_module_95d0__module_95d0__Object__init.html
-property_module_95d0__module_95d0__Object__output.html
-property_module_95d0__module_95d0__Object__print.html
-property_module_95d0__module_95d0__Sys__main.html
-property_module_95d1__module_95d1__A__a1.html
-property_module_95d1__module_95d1__A__a12.html
-property_module_95d1__module_95d1__A__a123.html
-property_module_95d1__module_95d1__A__a13.html
-property_module_95d1__module_95d1__B__all2.html
-property_module_95d1__module_95d1__B__all25.html
+module_module_95d0-.html
+module_module_95d1-.html
+property_module_95d0-__Object__init.html
+property_module_95d0-__Object__output.html
+property_module_95d0-__Object__print.html
+property_module_95d0-__Sys__main.html
+property_module_95d1-__A__a1.html
+property_module_95d1-__A__a12.html
+property_module_95d1-__A__a123.html
+property_module_95d1-__A__a13.html
+property_module_95d1-__B__all2.html
+property_module_95d1-__B__all25.html
 quicksearch-list.js
 resources/
 search.html

diff --git a/tests/sav/nitdoc_args2.res b/tests/sav/nitdoc_args2.res
index 3d95124..7906750 100644 (file)
--- a/tests/sav/nitdoc_args2.res
+++ b/tests/sav/nitdoc_args2.res
@@ -1,61 +1,61 @@
-class_base_attr_nullable__base_attr_nullable__Bar.html
-class_base_attr_nullable__base_attr_nullable__Bool.html
-class_base_attr_nullable__base_attr_nullable__Foo.html
-class_base_attr_nullable__base_attr_nullable__Int.html
-class_base_attr_nullable__base_attr_nullable__Integer.html
-class_base_attr_nullable__base_attr_nullable__Object.html
-class_base_attr_nullable__base_attr_nullable__Sys.html
+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
 css/
-dep_class_base_attr_nullable__base_attr_nullable__Bar.dot
-dep_class_base_attr_nullable__base_attr_nullable__Bar.map
-dep_class_base_attr_nullable__base_attr_nullable__Bar.png
-dep_class_base_attr_nullable__base_attr_nullable__Bar.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Bool.dot
-dep_class_base_attr_nullable__base_attr_nullable__Bool.map
-dep_class_base_attr_nullable__base_attr_nullable__Bool.png
-dep_class_base_attr_nullable__base_attr_nullable__Bool.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Foo.dot
-dep_class_base_attr_nullable__base_attr_nullable__Foo.map
-dep_class_base_attr_nullable__base_attr_nullable__Foo.png
-dep_class_base_attr_nullable__base_attr_nullable__Foo.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Int.dot
-dep_class_base_attr_nullable__base_attr_nullable__Int.map
-dep_class_base_attr_nullable__base_attr_nullable__Int.png
-dep_class_base_attr_nullable__base_attr_nullable__Int.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Integer.dot
-dep_class_base_attr_nullable__base_attr_nullable__Integer.map
-dep_class_base_attr_nullable__base_attr_nullable__Integer.png
-dep_class_base_attr_nullable__base_attr_nullable__Integer.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Object.dot
-dep_class_base_attr_nullable__base_attr_nullable__Object.map
-dep_class_base_attr_nullable__base_attr_nullable__Object.png
-dep_class_base_attr_nullable__base_attr_nullable__Object.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Sys.dot
-dep_class_base_attr_nullable__base_attr_nullable__Sys.map
-dep_class_base_attr_nullable__base_attr_nullable__Sys.png
-dep_class_base_attr_nullable__base_attr_nullable__Sys.s.dot
-dep_module_base_attr_nullable__base_attr_nullable.dot
-dep_module_base_attr_nullable__base_attr_nullable.map
-dep_module_base_attr_nullable__base_attr_nullable.png
-dep_module_base_attr_nullable__base_attr_nullable.s.dot
+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_module_base_attr_nullable-.dot
+dep_module_base_attr_nullable-.map
+dep_module_base_attr_nullable-.png
+dep_module_base_attr_nullable-.s.dot
 group_base_attr_nullable.html
 index.html
 js/
 less/
-module_base_attr_nullable__base_attr_nullable.html
-property_base_attr_nullable__base_attr_nullable__Bar__a3.html
-property_base_attr_nullable__base_attr_nullable__Foo__a1.html
-property_base_attr_nullable__base_attr_nullable__Foo__a2.html
-property_base_attr_nullable__base_attr_nullable__Foo__nop.html
-property_base_attr_nullable__base_attr_nullable__Foo__run.html
-property_base_attr_nullable__base_attr_nullable__Foo__run_other.html
-property_base_attr_nullable__base_attr_nullable__Int___43d.html
-property_base_attr_nullable__base_attr_nullable__Int__output.html
-property_base_attr_nullable__base_attr_nullable__Integer__init.html
-property_base_attr_nullable__base_attr_nullable__Integer__output.html
-property_base_attr_nullable__base_attr_nullable__Integer__val.html
-property_base_attr_nullable__base_attr_nullable__Object__init.html
-property_base_attr_nullable__base_attr_nullable__Sys__main.html
+module_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
 quicksearch-list.js
 resources/
 search.html

diff --git a/tests/sav/nitdoc_args3.res b/tests/sav/nitdoc_args3.res
index b982484..5b34671 100644 (file)
--- a/tests/sav/nitdoc_args3.res
+++ b/tests/sav/nitdoc_args3.res
@@ -1,69 +1,69 @@
-class_base_attr_nullable__base_attr_nullable__Bar.html
-class_base_attr_nullable__base_attr_nullable__Bool.html
-class_base_attr_nullable__base_attr_nullable__Foo.html
-class_base_attr_nullable__base_attr_nullable__Int.html
-class_base_attr_nullable__base_attr_nullable__Integer.html
-class_base_attr_nullable__base_attr_nullable__Object.html
-class_base_attr_nullable__base_attr_nullable__Sys.html
+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
 css/
-dep_class_base_attr_nullable__base_attr_nullable__Bar.dot
-dep_class_base_attr_nullable__base_attr_nullable__Bar.map
-dep_class_base_attr_nullable__base_attr_nullable__Bar.png
-dep_class_base_attr_nullable__base_attr_nullable__Bar.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Bool.dot
-dep_class_base_attr_nullable__base_attr_nullable__Bool.map
-dep_class_base_attr_nullable__base_attr_nullable__Bool.png
-dep_class_base_attr_nullable__base_attr_nullable__Bool.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Foo.dot
-dep_class_base_attr_nullable__base_attr_nullable__Foo.map
-dep_class_base_attr_nullable__base_attr_nullable__Foo.png
-dep_class_base_attr_nullable__base_attr_nullable__Foo.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Int.dot
-dep_class_base_attr_nullable__base_attr_nullable__Int.map
-dep_class_base_attr_nullable__base_attr_nullable__Int.png
-dep_class_base_attr_nullable__base_attr_nullable__Int.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Integer.dot
-dep_class_base_attr_nullable__base_attr_nullable__Integer.map
-dep_class_base_attr_nullable__base_attr_nullable__Integer.png
-dep_class_base_attr_nullable__base_attr_nullable__Integer.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Object.dot
-dep_class_base_attr_nullable__base_attr_nullable__Object.map
-dep_class_base_attr_nullable__base_attr_nullable__Object.png
-dep_class_base_attr_nullable__base_attr_nullable__Object.s.dot
-dep_class_base_attr_nullable__base_attr_nullable__Sys.dot
-dep_class_base_attr_nullable__base_attr_nullable__Sys.map
-dep_class_base_attr_nullable__base_attr_nullable__Sys.png
-dep_class_base_attr_nullable__base_attr_nullable__Sys.s.dot
-dep_module_base_attr_nullable__base_attr_nullable.dot
-dep_module_base_attr_nullable__base_attr_nullable.map
-dep_module_base_attr_nullable__base_attr_nullable.png
-dep_module_base_attr_nullable__base_attr_nullable.s.dot
+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_module_base_attr_nullable-.dot
+dep_module_base_attr_nullable-.map
+dep_module_base_attr_nullable-.png
+dep_module_base_attr_nullable-.s.dot
 group_base_attr_nullable.html
 index.html
 js/
 less/
-module_base_attr_nullable__base_attr_nullable.html
-property_base_attr_nullable__base_attr_nullable__Bar___a3.html
-property_base_attr_nullable__base_attr_nullable__Bar__a3.html
-property_base_attr_nullable__base_attr_nullable__Bar__a3_61d.html
-property_base_attr_nullable__base_attr_nullable__Foo___a1.html
-property_base_attr_nullable__base_attr_nullable__Foo___a2.html
-property_base_attr_nullable__base_attr_nullable__Foo__a1.html
-property_base_attr_nullable__base_attr_nullable__Foo__a1_61d.html
-property_base_attr_nullable__base_attr_nullable__Foo__a2.html
-property_base_attr_nullable__base_attr_nullable__Foo__a2_61d.html
-property_base_attr_nullable__base_attr_nullable__Foo__nop.html
-property_base_attr_nullable__base_attr_nullable__Foo__run.html
-property_base_attr_nullable__base_attr_nullable__Foo__run_other.html
-property_base_attr_nullable__base_attr_nullable__Int___43d.html
-property_base_attr_nullable__base_attr_nullable__Int__output.html
-property_base_attr_nullable__base_attr_nullable__Integer___val.html
-property_base_attr_nullable__base_attr_nullable__Integer__init.html
-property_base_attr_nullable__base_attr_nullable__Integer__output.html
-property_base_attr_nullable__base_attr_nullable__Integer__val.html
-property_base_attr_nullable__base_attr_nullable__Integer__val_61d.html
-property_base_attr_nullable__base_attr_nullable__Object__init.html
-property_base_attr_nullable__base_attr_nullable__Sys__main.html
+module_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
 quicksearch-list.js
 resources/
 search.html