#195 - Fixed highlighting for cyrillic chars

This commit is contained in:
Simon Cambier
2023-02-19 14:03:16 +01:00
parent ae08608e02
commit c70e446e84
3 changed files with 30 additions and 16 deletions

View File

@@ -1,6 +1,10 @@
<script lang="ts">
import type { ResultNote } from '../globals'
import { highlighter, makeExcerpt, stringsToRegex } from '../tools/utils'
import {
highlighterGroups,
makeExcerpt,
stringsToRegex,
} from '../tools/utils'
import ResultItemContainer from './ResultItemContainer.svelte'
export let offset: number
@@ -12,8 +16,12 @@
$: cleanedContent = makeExcerpt(note?.content ?? '', offset)
</script>
<ResultItemContainer id={index.toString()} {selected} on:mousemove on:click>
<ResultItemContainer
id="{index.toString()}"
selected="{selected}"
on:mousemove
on:click>
<div class="omnisearch-result__body">
{@html cleanedContent.replace(reg, highlighter)}
{@html cleanedContent.replace(reg, highlighterGroups)}
</div>
</ResultItemContainer>

View File

@@ -3,18 +3,16 @@
import type { ResultNote } from '../globals'
import {
getExtension,
highlighter,
highlighterGroups,
isFileCanvas,
isFileImage,
isFilePDF,
isFilePlaintext,
makeExcerpt,
pathWithoutFilename,
removeDiacritics,
stringsToRegex,
} from '../tools/utils'
import ResultItemContainer from './ResultItemContainer.svelte'
import { onMount } from 'svelte'
import { setIcon } from 'obsidian'
export let selected = false
@@ -54,7 +52,8 @@
if (elFilePathIcon) {
if (isFileImage(note.path)) setIcon(elFilePathIcon, 'image')
else if (isFilePDF(note.path)) setIcon(elFilePathIcon, 'file-text')
else if (isFileCanvas(note.path)) setIcon(elFilePathIcon, 'layout-dashboard')
else if (isFileCanvas(note.path))
setIcon(elFilePathIcon, 'layout-dashboard')
else setIcon(elFilePathIcon, 'file')
}
}
@@ -70,7 +69,7 @@
<div class="omnisearch-result__title-container">
<span class="omnisearch-result__title">
<span bind:this="{elFilePathIcon}"></span>
<span>{@html title.replace(reg, highlighter)}</span>
<span>{@html title.replace(reg, highlighterGroups)}</span>
<span class="omnisearch-result__extension"
>.{getExtension(note.path)}</span>
@@ -96,7 +95,7 @@
<div style="display: flex; flex-direction: row;">
{#if $showExcerpt}
<div class="omnisearch-result__body">
{@html cleanedContent.replace(reg, highlighter)}
{@html cleanedContent.replace(reg, highlighterGroups)}
</div>
{/if}