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

Search: make a difference between fullname and dispname

Browse Source
This commit is contained in:
Jakob Lykke Andersen 2018-06-09 13:03:38 +02:00
parent 6e035ede7c
commit dd711a7dc7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/search/__init__.py
View File

@ -331,13 +331,13 @@ class IndexBuilder(object):
for domainname, domain in sorted(iteritems(self.env.domains)): for domainname, domain in sorted(iteritems(self.env.domains)):
for fullname, dispname, type, docname, anchor, prio in \ for fullname, dispname, type, docname, anchor, prio in \
sorted(domain.get_objects()): sorted(domain.get_objects()):
# XXX use dispname?
if docname not in fn2index: if docname not in fn2index:
continue continue
if prio < 0: if prio < 0:
continue continue
fullname = htmlescape(fullname) fullname = htmlescape(fullname)
prefix, name = rpartition(fullname, '.') dispname = htmlescape(dispname)
prefix, name = rpartition(dispname, '.')
pdict = rv.setdefault(prefix, {}) pdict = rv.setdefault(prefix, {})
try: try:
typeindex = otypes[domainname, type] typeindex = otypes[domainname, type]

2
tests/test_search.py
View File

@ -161,7 +161,7 @@ def test_IndexBuilder():
'docnames': ('docname', 'docname2'), 'docnames': ('docname', 'docname2'),
'envversion': '1.0', 'envversion': '1.0',
'filenames': ['filename', 'filename2'], 'filenames': ['filename', 'filename2'],
'objects': {'': {'objname': (0, 0, 1, '#anchor')}}, 'objects': {'': {'objdispname': (0, 0, 1, '#anchor')}},
'objnames': {0: ('dummy', 'objtype', 'objtype')}, 'objnames': {0: ('dummy', 'objtype', 'objtype')},
'objtypes': {0: 'dummy:objtype'}, 'objtypes': {0: 'dummy:objtype'},
'terms': {'comment': [0, 1], 'terms': {'comment': [0, 1],