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

Codetools: IdentifierCompletion, fix freeing correct item if History.Capacity is reached. Issue #40354

Browse Source
This commit is contained in:
Martin 2023-07-17 21:32:21 +02:00
parent 9146a986b4
commit 8533349aba
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/codetools/identcompletiontool.pas
View File

@ -4602,12 +4602,23 @@ end;
{ TIdentifierHistoryList }
procedure TIdentifierHistoryList.SetCapacity(const AValue: integer);
var
AnAVLNode, AnAVLNode2: TAVLTreeNode;
begin
if FCapacity=AValue then exit;
FCapacity:=AValue;
if FCapacity<1 then FCapacity:=1;
while (FItems.Count>0) and (FItems.Count>=FCapacity) do
FItems.FreeAndDelete(FItems.FindHighest);
if (FItems.Count>=FCapacity) then begin
AnAVLNode:=Fitems.FindLowest;
while (AnAVLNode<>nil) do begin
AnAVLNode2:=FItems.FindSuccessor(AnAVLNode);
if TIdentHistListItem(AnAVLNode.Data).HistoryIndex > FCapacity then
FItems.FreeAndDelete(AnAVLNode);
AnAVLNode:=AnAVLNode2;
end;
if (FItems.Count>=FCapacity) then // data corrupted?
FItems.Clear;
end;
end;
function TIdentifierHistoryList.FindItem(NewItem: TIdentifierListItem
@ -4641,7 +4652,7 @@ procedure TIdentifierHistoryList.Add(NewItem: TIdentifierListItem);
var
OldAVLNode: TAVLTreeNode;
NewHistItem: TIdentHistListItem;
AnAVLNode: TAVLTreeNode;
AnAVLNode, HighestAVLNode: TAVLTreeNode;
AdjustIndex: Integer;
AnHistItem: TIdentHistListItem;
begin
@ -4675,8 +4686,20 @@ begin
inc(AnHistItem.HistoryIndex);
AnAVLNode:=FItems.FindSuccessor(AnAVLNode);
end;
if (FItems.Count>0) and (FItems.Count>=FCapacity) then
FItems.FreeAndDelete(FItems.FindHighest);
if (FItems.Count>0) and (FItems.Count>=FCapacity) then begin
HighestAVLNode:=Fitems.FindLowest;
AnHistItem:=TIdentHistListItem(HighestAVLNode.Data);
AnAVLNode:=FItems.FindSuccessor(HighestAVLNode);
while (AnAVLNode<>nil) do begin
if TIdentHistListItem(AnAVLNode.Data).HistoryIndex > AnHistItem.HistoryIndex then begin
HighestAVLNode:=AnAVLNode;
AnHistItem:=TIdentHistListItem(HighestAVLNode.Data);
end;
AnAVLNode:=FItems.FindSuccessor(AnAVLNode);
end;
FItems.FreeAndDelete(HighestAVLNode);
end;
FItems.Add(NewHistItem);
{$IFDEF ShowHistory}
DebugLn(['TIdentifierHistoryList.Added Count=',Count]);