paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 22:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: FoldedView, fix accessing out of range lines (due to wrong internal fTopViewPos). Introduced in 86abcd75d9

Browse Source
This commit is contained in:
Martin 2025-03-09 12:44:46 +01:00
parent 482124d17e
commit 847f6ab0e4
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/synedit/syneditfoldedview.pp
View File

@ -3429,8 +3429,15 @@ begin
CurFoldedBefore := node.FoldedBefore; CurFoldedBefore := node.FoldedBefore;
ViewIdx := ToIdx(fTopViewPos + CurFoldedBefore); ViewIdx := ToIdx(fTopViewPos + CurFoldedBefore);
TxtIdx := NextLines.DisplayView.ViewToTextIndexEx(ViewIdx, ViewRange); TxtIdx := NextLines.DisplayView.ViewToTextIndexEx(ViewIdx, ViewRange);
cnt := NextLines.Count;
// Prepare data for line one above fTopViewPos // Prepare data for line one above fTopViewPos
if (TxtIdx >= cnt) or (TxtIdx < -1) then begin
// Past end of Text
NewCapability := [];
NewClassifications := [];
end
else begin
If ViewIdx > ViewRange.Top then begin If ViewIdx > ViewRange.Top then begin
// Need CurLine.... data for wrapped lines // Need CurLine.... data for wrapped lines
CurLineCapability := FFoldProvider.LineCapabilities[TxtIdx]; CurLineCapability := FFoldProvider.LineCapabilities[TxtIdx];
@ -3464,6 +3471,7 @@ begin
NewCapability := NewCapability + [cfFoldBody]; NewCapability := NewCapability + [cfFoldBody];
NewCapability := NewCapability - [cfFoldStart, cfHideStart]; NewCapability := NewCapability - [cfFoldStart, cfHideStart];
end; end;
end;
// Add entry for line one above virtual topViewPos // Add entry for line one above virtual topViewPos
if (fFoldTypeList[0].Capability <> NewCapability) or if (fFoldTypeList[0].Capability <> NewCapability) or
@ -3478,7 +3486,6 @@ begin
{$IFDEF SynFoldDebug}debugln(['FOLD-- CalculateMaps fTopViewPos:=', fTopViewPos, ' TxtIdx=',TxtIdx]);{$ENDIF} {$IFDEF SynFoldDebug}debugln(['FOLD-- CalculateMaps fTopViewPos:=', fTopViewPos, ' TxtIdx=',TxtIdx]);{$ENDIF}
cnt := NextLines.Count;
for i := 1 to fLinesInWindow + 2 do begin for i := 1 to fLinesInWindow + 2 do begin
if (TxtIdx >= cnt) or (TxtIdx < -1) then begin if (TxtIdx >= cnt) or (TxtIdx < -1) then begin
// Past end of Text // Past end of Text