intersphinx role, update based on merged refactoring

2 files changed, 17 insertions, 11 deletions

diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index d004f867f..c3cf0eec7 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -563,17 +563,21 @@ class IntersphinxRoleResolver(ReferencesResolver):
 
     def run(self, **kwargs: Any) -> None:
         for node in self.document.traverse(pending_xref):
-            if 'intersphinx' in node:
-                contnode = cast(nodes.TextElement, node[0].deepcopy())
-                # temporary hax to glue on inventory info again
-                if node['inventory'] is not None:
-                    node['reftarget'] = node['inventory'] + ":" + node['reftarget']
-                newnode = missing_reference(self.app, self.env, node, contnode)
-                if newnode is None:
-                    # no warning, the normal missing_reference handler will do that
-                    pass
-                else:
-                    node.replace_self(newnode)
+            if 'intersphinx' not in node:
+                continue
+            contnode = cast(nodes.TextElement, node[0].deepcopy())
+            inv_name = node['inventory']
+            if inv_name is not None:
+                if not inventory_exists(self.env, inv_name):
+                    continue
+                newnode = resolve_reference_in_inventory(self.env, inv_name, node, contnode)
+            else:
+                newnode = resolve_reference_any_inventory(self.env, False, node, contnode)
+            if newnode is None:
+                # no warning, the normal missing_reference handler will do that
+                pass
+            else:
+                node.replace_self(newnode)
 
 
 def install_dispatcher(app: Sphinx, docname: str, source: List[str]) -> None:
diff --git a/tests/roots/test-ext-intersphinx-role/conf.py b/tests/roots/test-ext-intersphinx-role/conf.py
index 9485eb207..a54f5c2ad 100644
--- a/tests/roots/test-ext-intersphinx-role/conf.py
+++ b/tests/roots/test-ext-intersphinx-role/conf.py
@@ -1 +1,3 @@
 extensions = ['sphinx.ext.intersphinx']
+# the role should not honor this conf var
+intersphinx_disabled_reftypes = ['*']