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

Fix rev 18176 #bafca9d60e (SynEdit Folding: Fixed detection of procedure blocks) some reloading a file could take forever

Browse Source 
git-svn-id: trunk@18179 -
This commit is contained in:
martin 2009-01-07 01:48:51 +00:00
parent 19ff151b3b
commit 1c81212e2f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/synedit/synedit.pp
View File

@ -44,6 +44,7 @@ Known Issues:
unit SynEdit; unit SynEdit;
{$I synedit.inc} {$I synedit.inc}
{$IFDEF LCLGTK1} {$IFDEF LCLGTK1}
@ -4909,32 +4910,35 @@ end;
function TCustomSynEdit.ScanFrom(Index: integer; AtLeastTilIndex: integer): integer; function TCustomSynEdit.ScanFrom(Index: integer; AtLeastTilIndex: integer): integer;
// Index and AtLeastTilIndex are 0 based // Index and AtLeastTilIndex are 0 based
var var
FixFStart: Integer;
LastLineDiffers : Boolean; LastLineDiffers : Boolean;
SkipPrev: Boolean;
procedure SetCodeFoldAttributes; procedure SetCodeFoldAttributes;
begin begin
FFoldedLinesView.FoldMinLevel[Result-1] := fHighlighter.MinimumCodeFoldBlockLevel; FFoldedLinesView.FoldMinLevel[Result-1] := fHighlighter.MinimumCodeFoldBlockLevel;
FFoldedLinesView.FoldEndLevel[Result-1] := fHighlighter.CurrentCodeFoldBlockLevel; FFoldedLinesView.FoldEndLevel[Result-1] := fHighlighter.CurrentCodeFoldBlockLevel;
if (fHighlighter.LastLineCodeFoldLevelFix <> 0) and (result > 1) then begin if (fHighlighter.LastLineCodeFoldLevelFix <> 0) and (result > 1) then begin
if Result >= Index Then Begin if SkipPrev then
FixFStart := Index - 1
else begin
FFoldedLinesView.FoldEndLevel[Result-2] := FFoldedLinesView.FoldEndLevel[Result-2] :=
FFoldedLinesView.FoldEndLevel[Result-2] + fHighlighter.LastLineCodeFoldLevelFix; FFoldedLinesView.FoldEndLevel[Result-2] + fHighlighter.LastLineCodeFoldLevelFix;
if FFoldedLinesView.FoldMinLevel[Result-2] > FFoldedLinesView.FoldEndLevel[Result-2] then if FFoldedLinesView.FoldMinLevel[Result-2] > FFoldedLinesView.FoldEndLevel[Result-2] then
FFoldedLinesView.FoldMinLevel[Result-2] := FFoldedLinesView.FoldEndLevel[Result-2]; FFoldedLinesView.FoldMinLevel[Result-2] := FFoldedLinesView.FoldEndLevel[Result-2];
end end;
else
dec(Index);
end; end;
end; end;
begin begin
if Index < 0 then Index := 0; if Index < 0 then Index := 0;
Result := Min(Index - 1, 0); Result := Max(Index - 1,0);
if not assigned(fHighlighter) or (Index > Lines.Count - 1) then begin if not assigned(fHighlighter) or (Index > Lines.Count - 1) then begin
FFoldedLinesView.FixFoldingAtTextIndex(Index); FFoldedLinesView.FixFoldingAtTextIndex(Index);
fMarkupManager.TextChangedScreen(Max(RowToScreenRow(Index+1), 0), LinesInWindow+1); fMarkupManager.TextChangedScreen(Max(RowToScreenRow(Index+1), 0), LinesInWindow+1);
Topline := TopLine; Topline := TopLine;
exit; exit;
end; end;
FixFStart := Index;
if Result > 0 then if Result > 0 then
fHighlighter.SetRange(TSynEditStrings(Lines).Ranges[Result]) fHighlighter.SetRange(TSynEditStrings(Lines).Ranges[Result])
else begin else begin
@ -4952,6 +4956,7 @@ begin
inc(Result); inc(Result);
fHighlighter.NextToEol; fHighlighter.NextToEol;
LastLineDiffers := True; LastLineDiffers := True;
SkipPrev := True;
while (fHighlighter.GetRange <> TSynEditStrings(Lines).Ranges[Result]) while (fHighlighter.GetRange <> TSynEditStrings(Lines).Ranges[Result])
or (fHighlighter.LastLineCodeFoldLevelFix <> 0) or (fHighlighter.LastLineCodeFoldLevelFix <> 0)
or (FFoldedLinesView.FoldMinLevel[Result-1] <> fHighlighter.MinimumCodeFoldBlockLevel) or (FFoldedLinesView.FoldMinLevel[Result-1] <> fHighlighter.MinimumCodeFoldBlockLevel)
@ -4965,6 +4970,7 @@ begin
or (FFoldedLinesView.FoldEndLevel[Result-1] <> fHighlighter.CurrentCodeFoldBlockLevel); or (FFoldedLinesView.FoldEndLevel[Result-1] <> fHighlighter.CurrentCodeFoldBlockLevel);
TSynEditStrings(Lines).Ranges[Result] := fHighlighter.GetRange; TSynEditStrings(Lines).Ranges[Result] := fHighlighter.GetRange;
SetCodeFoldAttributes; SetCodeFoldAttributes;
SkipPrev := False;
//if (Result and $fff)=0 then //if (Result and $fff)=0 then
// debugln('TCustomSynEdit.ScanFrom A Line=', dbgs(Result),' Index=',dbgs(Index),' MinLevel=',dbgs(CodeFoldMinLevel),' EndLevel=',dbgs(CodeFoldEndLevel),' CodeFoldType=',dbgs(ord(CodeFoldType)),' ',dbgs(length(Lines[Result-1]))); // debugln('TCustomSynEdit.ScanFrom A Line=', dbgs(Result),' Index=',dbgs(Index),' MinLevel=',dbgs(CodeFoldMinLevel),' EndLevel=',dbgs(CodeFoldEndLevel),' CodeFoldType=',dbgs(ord(CodeFoldType)),' ',dbgs(length(Lines[Result-1])));
fHighlighter.SetLine(Lines[Result], Result); fHighlighter.SetLine(Lines[Result], Result);
@ -4979,11 +4985,11 @@ begin
// => update code fold attributes of last scanned line // => update code fold attributes of last scanned line
if (Result>Index+1) and (Result<=Lines.Count) then if (Result>Index+1) and (Result<=Lines.Count) then
SetCodeFoldAttributes; SetCodeFoldAttributes;
FFoldedLinesView.FixFoldingAtTextIndex(Index, Result); FFoldedLinesView.FixFoldingAtTextIndex(FixFStart, Result);
fMarkupManager.TextChangedScreen(Max(RowToScreenRow(Index + 1), 0), fMarkupManager.TextChangedScreen(Max(RowToScreenRow(FixFStart+1), 0),
Min(RowToScreenRow(Result), LinesInWindow+1)); Min(RowToScreenRow(Result), LinesInWindow+1));
Topline := TopLine; Topline := TopLine;
if Index < index then Invalidate; if FixFStart < index then Invalidate;
Dec(Result); Dec(Result);
end; end;