js nodes, update name rendering

sphinx-doc · Oct 2, 2021 · e3766fa · e3766fa
1 parent af7e47b
commit e3766fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
@@ -108,7 +108,7 @@ def handle_signature(self, sig: str, signode: desc_signature) -> Tuple[str, str]
                 addName += addnodes.desc_sig_name(p, p)
                 addName += addnodes.desc_sig_punctuation('.', '.')
             signode += addName
-        signode += addnodes.desc_name(name, name)
+        signode += addnodes.desc_name('', '', addnodes.desc_sig_name(name, name))
         if self.has_arguments:
             if not arglist:
                 signode += addnodes.desc_parameterlist()

diff --git a/tests/test_domain_js.py b/tests/test_domain_js.py
@@ -15,8 +15,8 @@
 
 from sphinx import addnodes
 from sphinx.addnodes import (desc, desc_annotation, desc_content, desc_name, desc_parameter,
-                             desc_parameterlist, desc_sig_keyword, desc_sig_space,
-                             desc_signature)
+                             desc_parameterlist, desc_sig_keyword, desc_sig_name,
+                             desc_sig_space, desc_signature)
 from sphinx.domains.javascript import JavaScriptDomain
 from sphinx.testing import restructuredtext
 from sphinx.testing.util import assert_node
@@ -185,7 +185,7 @@ def test_js_function(app):
     text = ".. js:function:: sum(a, b)"
     doctree = restructuredtext.parse(app, text)
     assert_node(doctree, (addnodes.index,
-                          [desc, ([desc_signature, ([desc_name, "sum"],
+                          [desc, ([desc_signature, ([desc_name, ([desc_sig_name, "sum"])],
                                                     desc_parameterlist)],
                                   [desc_content, ()])]))
     assert_node(doctree[1][0][1], [desc_parameterlist, ([desc_parameter, "a"],
@@ -201,7 +201,7 @@ def test_js_class(app):
     assert_node(doctree, (addnodes.index,
                           [desc, ([desc_signature, ([desc_annotation, ([desc_sig_keyword, 'class'],
                                                                        desc_sig_space)],
-                                                    [desc_name, "Application"],
+                                                    [desc_name, ([desc_sig_name, "Application"])],
                                                     [desc_parameterlist, ()])],
                                   [desc_content, ()])]))
     assert_node(doctree[0], addnodes.index,
@@ -213,7 +213,7 @@ def test_js_data(app):
     text = ".. js:data:: name"
     doctree = restructuredtext.parse(app, text)
     assert_node(doctree, (addnodes.index,
-                          [desc, ([desc_signature, desc_name, "name"],
+                          [desc, ([desc_signature, ([desc_name, ([desc_sig_name, "name"])])],
                                   [desc_content, ()])]))
     assert_node(doctree[0], addnodes.index,
                 entries=[("single", "name (global variable or constant)", "name", "", None)])