Merge pull request sphinx-doc#7496 from jakobandersen/jbab-cpp-east-c…

…onst-spacing C++, rebased version of sphinx-doc#7489
tk0miya · Apr 17, 2020 · 21ca437 · 21ca437
2 parents 86ef852 + 9e6e458
commit 21ca437
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -21,6 +21,7 @@ Bugs fixed
 
 * #7461: py domain: fails with IndexError for empty tuple in type annotation
 * #7461: autodoc: empty tuple in type annotation is not shown correctly
+* C++, fix spacing issue in east-const declarations.
 
 Testing
 --------

diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
@@ -2062,12 +2062,15 @@ def describe_signature(self, signode: TextElement, mode: str,
         if self.trailingTypeSpec:
             if addSpace:
                 signode += nodes.Text(' ')
+            numChildren = len(signode)
             self.trailingTypeSpec.describe_signature(signode, mode, env,
                                                      symbol=symbol)
-            numChildren = len(signode)
-            self.rightSpecs.describe_signature(signode)
-            if len(signode) != numChildren:
-                signode += nodes.Text(' ')
+            addSpace = len(signode) != numChildren
+
+            if len(str(self.rightSpecs)) > 0:
+                if addSpace:
+                    signode += nodes.Text(' ')
+                self.rightSpecs.describe_signature(signode)
 
 
 # Declarator