gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-29 20:43:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gitbutlerapp/gitbutler-client

Browse Source
This commit is contained in:
Ian Donahue 2023-03-10 16:19:42 +01:00
commit 571a9edef8
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/components/search/RenderedSearchResult.svelte
View File

@ -31,7 +31,8 @@
: line.operation === 'remove'
? 'bg-[#FF0000]/20'
: ''}
">{@html line.content}</pre>
">{line.contentBeforeHit}<span class="rounded-sm bg-[#AC8F2F]">{line.contentAtHit}</span
>{line.contentAfterHit}</pre>
</div>
{:else}
<!-- <span>hidden</span> -->

4
src/lib/components/search/index.ts
View File

@ -4,7 +4,9 @@ import type { SearchResult } from '$lib/search';
export type ProcessedSearchResultLine = {
hidden: boolean;
content: string;
contentBeforeHit: string;
contentAtHit: string;
contentAfterHit: string;
operation: string;
lineNumber: number | undefined;
hasKeyword: boolean;

19
src/lib/components/search/process.ts
View File

@ -84,23 +84,24 @@ const processHunkLines = (lines: string[], newStart: number, query: string) => {
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
let content = '';
let contentBeforeHit = '';
let querySubstring = '';
let contentAfterHit = '';
if (!line.includes(query)) {
content = line.slice(1);
contentBeforeHit = line.slice(1);
} else {
const firstCharIndex = line.indexOf(query);
const lastCharIndex = firstCharIndex + query.length - 1;
const beforeQuery = line.slice(1, firstCharIndex);
const querySubstring = line.slice(firstCharIndex, lastCharIndex + 1);
const afterQuery = line.slice(lastCharIndex + 1);
content =
beforeQuery + `<span class="bg-[#AC8F2F] rounded-sm">${querySubstring}</span>` + afterQuery;
contentBeforeHit = line.slice(1, firstCharIndex);
querySubstring = line.slice(firstCharIndex, lastCharIndex + 1);
contentAfterHit = line.slice(lastCharIndex + 1);
}
outLines.push({
hidden: false,
content: content,
contentBeforeHit: contentBeforeHit,
contentAtHit: querySubstring,
contentAfterHit: contentAfterHit,
operation: line.startsWith('+') ? 'add' : line.startsWith('-') ? 'remove' : 'unmodified',
lineNumber: !line.startsWith('-') ? lineNumber : undefined,
hasKeyword: line.includes(query)