ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-12 04:15:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add safety to range highlighting for search result panel

Browse source
This commit is contained in:
bkellam 2024-09-17 23:58:29 -07:00
parent 1d8335b699
commit 649223a607
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/app/search/searchResultsPanel.tsx
View file

@ -239,9 +239,26 @@ const CodePreview = ({
.sort((a, b) => { .sort((a, b) => {
return a.Start.ByteOffset - b.Start.ByteOffset; return a.Start.ByteOffset - b.Start.ByteOffset;
}) })
.filter(({ Start, End }) => {
const startLine = Start.LineNumber - lineOffset;
const endLine = End.LineNumber - lineOffset;
if (
startLine < 1 ||
endLine < 1 ||
startLine > document.lines ||
endLine > document.lines
) {
return false;
}
return true;
})
.map(({ Start, End }) => { .map(({ Start, End }) => {
const from = document.line(Start.LineNumber - lineOffset).from + Start.Column - 1; const startLine = Start.LineNumber - lineOffset;
const to = document.line(End.LineNumber - lineOffset).from + End.Column - 1; const endLine = End.LineNumber - lineOffset;
const from = document.line(startLine).from + Start.Column - 1;
const to = document.line(endLine).from + End.Column - 1;
return markDecoration.range(from, to); return markDecoration.range(from, to);
}); });
@ -254,7 +271,7 @@ const CodePreview = ({
}), }),
cmTheme cmTheme
]; ];
}, [ranges]); }, [ranges, lineOffset]);
const extensions = useMemo(() => { const extensions = useMemo(() => {
return [ return [