HTML Search: Fix multiple term matching edge case

sphinx/themes/basic/static/searchtools.js

@@ -511,9 +511,13 @@ const Search = {
 
  // create the mapping
  files.forEach((file) => {
- if (fileMap.has(file) && fileMap.get(file).indexOf(word) === -1)
- fileMap.get(file).push(word);
- else fileMap.set(file, [word]);
+ if (fileMap.has(file)) {
+ if (fileMap.get(file).indexOf(word) === -1) {
+ fileMap.get(file).push(word);
+ }
+ } else {
+ fileMap.set(file, [word]);
+ }
  });
  });
 

tests/js/searchtools.js

@@ -27,6 +27,36 @@ describe('Basic html theme search', function() {
  expect(Search.performTermsSearch(searchterms, excluded, terms, titleterms)).toEqual(hits);
  });
 
+ it('should be able to search for multiple terms', function() {
+ index = {
+ alltitles: {
+ 'Main Page': [[0, 'main-page']],
+ },
+ docnames:["index"],
+ filenames:["index.rst"],
+ indexentries:{},
+ objects:{},
+ objtypes: {},
+ objnames: {},
+ terms:{main:0, page:0},
+ titles:["Main Page"],
+ titleterms:{ main:0, page:0 }
+ }
+ Search.setIndex(index);
+ searchterms = ['main', 'page'];
+ excluded = [];
+ terms = index.terms;
+ titleterms = index.titleterms;
+ hits = [[
+ 'index',
+ 'Main Page',
+ '',
+ null,
+ 15,
+ 'index.rst']];
+ expect(Search.performTermsSearch(searchterms, excluded, terms, titleterms)).toEqual(hits);
+ });
+
  });
 
 });