Merge pull request #5656 from hendrikp/master

Custom search.seperator with lookbehind, in combination with highlighter, produces highlighting all over the place
This commit is contained in:
Martin Donath 2023-06-29 12:01:00 +02:00 committed by GitHub
commit 50429ad711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -240,7 +240,7 @@
</script>
{% endblock %}
{% block scripts %}
<script src="{{ 'assets/javascripts/bundle.90f9b918.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.a2cf1a4c.min.js' | url }}"></script>
{% for path in config.extra_javascript %}
{% if path.endswith(".mjs") %}
<script type="module" src="{{ path | url }}"></script>

View File

@ -60,9 +60,9 @@ export type SearchHighlightFactoryFn = (query: string) => SearchHighlightFn
export function setupSearchHighlighter(
config: SearchConfig
): SearchHighlightFactoryFn {
// Hack: temporarily remove pure lookaheads
// Hack: temporarily remove pure lookaheads and lookbehinds
const regex = config.separator.split("|").map(term => {
const temp = term.replace(/(\(\?[!=][^)]+\))/g, "")
const temp = term.replace(/(\(\?[!=<][^)]+\))/g, "")
return temp.length === 0 ? "<22>" : term
})
.join("|")