Fix "can't link function short name if it matches module name"

sphinxcontrib/mat_documenters.py

@@ -235,7 +235,10 @@ def auto_link_see_also(self, docstrings):
                             o = None
                         if o:
                             if isinstance(o, dict):
-                                o = o["class"]
+                                if "class" in o:
+                                    o = o["class"]
+                                elif "func" in o:
+                                    o = o["func"]
                             role = o.ref_role()
                             if role in ["class", "func"]:
                                 entries[k] = f":{role}:`{entries[k]}`"
@@ -318,7 +321,10 @@ def auto_link_all(self, docstrings):
         # auto-link known classes and functions everywhere
         for n, o in entities_table.items():
             if isinstance(o, dict):
-                o = o["class"]
+                if "class" in o:
+                    o = o["class"]
+                elif "func" in o:
+                    o = o["func"]
             role = o.ref_role()
             if role in ["class", "func"]:
                 nn = n.replace("+", "")  # remove + from name

sphinxcontrib/mat_types.py

@@ -296,7 +296,13 @@ def isClassFolderModule(name, entity):
     long_names = entities_table.keys()
     for name, entity in entities_table.items():
         short_name = shortest_name(name)
-        if short_name != name and not (short_name in long_names and name in long_names):
+        if (
+            short_name != name
+            and not (short_name in long_names and name in long_names)
+            or short_name in long_names
+            and (entity.ref_role() == "func" or entity.ref_role() == "class")
+            and entities_table[short_name].ref_role() == "mod"
+        ):
             # Only handle the below special case when overwriting entries in entities_table will not
             # introduce conflicts
             if short_name in entities_table:

sphinxcontrib/matlab.py

@@ -258,7 +258,7 @@ def get_index_text(self, modname, name):
     def add_target_and_index(self, name_cls, sig, signode):
         modname = self.options.get("module", self.env.temp_data.get("mat:module"))
 
-        if self.env.config.matlab_short_links:
+        if self.env.config.matlab_short_links and not name_cls[0] == modname:
             # modname is only used for package names
             # - "target.+package" => "package"
             # - "target" => ""