IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of options with enabled option_emphasise_placeholders (#10565)

Browse Source
This commit is contained in:
Martin Liška 2022-06-19 23:51:48 +02:00 committed by GitHub
parent ec596de871
commit ea46202565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sphinx/domains/std.py
View File

@ -186,23 +186,22 @@ class Cmdoption(ObjectDescription[str]):
signode += addnodes.desc_name(optname, optname) signode += addnodes.desc_name(optname, optname)
if self.env.config.option_emphasise_placeholders: if self.env.config.option_emphasise_placeholders:
add_end_bracket = False add_end_bracket = False
if not args: if args:
continue if args[0] == '[' and args[-1] == ']':
if args[0] == '[' and args[-1] == ']': add_end_bracket = True
add_end_bracket = True signode += addnodes.desc_sig_punctuation('[', '[')
signode += addnodes.desc_sig_punctuation('[', '[') args = args[1:-1]
args = args[1:-1] elif args[0] == ' ':
if args[0] == ' ': signode += addnodes.desc_sig_space()
signode += addnodes.desc_sig_space() args = args.strip()
args = args.strip() elif args[0] == '=':
if args[0] == '=': signode += addnodes.desc_sig_punctuation('=', '=')
signode += addnodes.desc_sig_punctuation('=', '=') args = args[1:]
args = args[1:] for part in samp_role.parse(args):
for part in samp_role.parse(args): if isinstance(part, nodes.Text):
if isinstance(part, nodes.Text): signode += nodes.Text(part.astext())
signode += nodes.Text(part.astext()) else:
else: signode += part
signode += part
if add_end_bracket: if add_end_bracket:
signode += addnodes.desc_sig_punctuation(']', ']') signode += addnodes.desc_sig_punctuation(']', ']')
else: else:

5
tests/test_build_html.py
View File

@ -1748,6 +1748,8 @@ def test_option_emphasise_placeholders(app, status, warning):
'<span class="pre">-</span>' '<span class="pre">-</span>'
'<em><span class="pre">COUNT</span></em>' in content) '<em><span class="pre">COUNT</span></em>' in content)
assert '<span class="pre">{{value}}</span>' in content assert '<span class="pre">{{value}}</span>' in content
assert ('<span class="pre">--plugin.option</span></span>'
'<a class="headerlink" href="#cmdoption-perl-plugin.option" title="Permalink to this definition">¶</a></dt>') in content
@pytest.mark.sphinx('html', testroot='root') @pytest.mark.sphinx('html', testroot='root')
@ -1757,6 +1759,9 @@ def test_option_emphasise_placeholders_default(app, status, warning):
assert '<span class="pre">={TYPE}</span>' in content assert '<span class="pre">={TYPE}</span>' in content
assert '<span class="pre">={WHERE}-{COUNT}</span></span>' in content assert '<span class="pre">={WHERE}-{COUNT}</span></span>' in content
assert '<span class="pre">{client_name}</span>' in content assert '<span class="pre">{client_name}</span>' in content
assert ('<span class="pre">--plugin.option</span></span>'
'<span class="sig-prename descclassname"></span>'
'<a class="headerlink" href="#cmdoption-perl-plugin.option" title="Permalink to this definition">¶</a></dt>') in content
@pytest.mark.sphinx('html', testroot='theming') @pytest.mark.sphinx('html', testroot='theming')