Domain, more precise contnode type

Author: jakobandersen

sphinx/domains/__init__.py

@@ -15,7 +15,7 @@
                     Type, Union, cast)
 
 from docutils import nodes
-from docutils.nodes import Element, Node, system_message
+from docutils.nodes import Element, Node, TextElement, system_message
 from docutils.parsers.rst.states import Inliner
 
 from sphinx.addnodes import pending_xref
@@ -317,7 +317,7 @@ def process_field_xref(self, pnode: pending_xref) -> None:
         pass
 
     def resolve_xref(self, env: "BuildEnvironment", fromdocname: str, builder: "Builder",
-                     typ: str, target: str, node: pending_xref, contnode: Element
+                     typ: str, target: str, node: pending_xref, contnode: TextElement
                      ) -> Element:
         """Resolve the pending_xref *node* with the given *typ* and *target*.
 
@@ -335,7 +335,7 @@ def resolve_xref(self, env: "BuildEnvironment", fromdocname: str, builder: "Buil
         pass
 
     def resolve_any_xref(self, env: "BuildEnvironment", fromdocname: str, builder: "Builder",
-                         target: str, node: pending_xref, contnode: Element
+                         target: str, node: pending_xref, contnode: TextElement
                          ) -> List[Tuple[str, Element]]:
         """Resolve the pending_xref *node* with the given *target*.
 

sphinx/transforms/post_transforms/__init__.py

@@ -11,7 +11,7 @@
 from typing import Any, Dict, List, Optional, Tuple, Type, cast
 
 from docutils import nodes
-from docutils.nodes import Element
+from docutils.nodes import Element, TextElement
 
 from sphinx import addnodes
 from sphinx.addnodes import pending_xref
@@ -117,7 +117,8 @@ def run(self, **kwargs: Any) -> None:
 
             node.replace_self(newnodes)
 
-    def resolve_anyref(self, refdoc: str, node: pending_xref, contnode: Element) -> Element:
+    def resolve_anyref(self, refdoc: str,
+                       node: pending_xref, contnode: TextElement) -> Element:
         """Resolve reference generated by the "any" role."""
         stddomain = self.env.get_domain('std')
         target = node['reftarget']