paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 14:29:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Code-Templates, fix mem leak / Correct extend of try-except block (do not hide errors, that are not expected/handled)

Browse Source 
git-svn-id: trunk@62285 -
This commit is contained in:
martin 2019-11-22 21:22:38 +00:00
parent c93e1c6d7e
commit 67d6109619
1 changed files with 37 additions and 35 deletions

72
ide/editoroptions.pp
View File

@ -5255,44 +5255,46 @@ begin
try
LoadStringsFromFileUTF8(AnAutoComplete.AutoCompleteList, s);
Result := mrOK;
FileVersion := AnAutoComplete.Completions.Count;
if (FileVersion > 0) then begin
FileVersion := AnAutoComplete.CompletionAttributes[0].IndexOfName(DciFileVersionName);
if (FileVersion >= 0) then
FileVersion := StrToIntDef(AnAutoComplete.CompletionAttributes[0][FileVersion], 0);
end;
if FileVersion < DciFileVersion then begin
// Merge new entries
NewAutoComplete := TSynEditAutoComplete.Create(nil);
NewAutoComplete.AutoCompleteList.Text := ResourceDCIAsText;
Added := False;
for i := 0 to NewAutoComplete.Completions.Count - 1 do begin
j := NewAutoComplete.CompletionAttributes[i].IndexOfName(DciVersionName);
if j < 0 then
continue;
v := StrToIntDef(AnAutoComplete.CompletionAttributes[i][j], 0);
if v <= FileVersion then
continue;
if AnAutoComplete.Completions.IndexOf(NewAutoComplete.Completions[i]) >= 0 then
continue;
Attr := TStringList.Create;
Attr.Assign(NewAutoComplete.CompletionAttributes[i]); // will be owned by AnAutoComplete;
AnAutoComplete.AddCompletion(
NewAutoComplete.Completions[i],
NewAutoComplete.CompletionValues[i],
NewAutoComplete.CompletionComments[i],
Attr);
Added := True;
end;
NewAutoComplete.Free;
if Added then
if BuildBorlandDCIFile(AnAutoComplete) then
SaveCodeTemplates(AnAutoComplete);
end;
except
Result := mrAbort;
end;
if Result = mrAbort then
exit;
FileVersion := AnAutoComplete.Completions.Count;
if (FileVersion > 0) then begin
FileVersion := AnAutoComplete.CompletionAttributes[0].IndexOfName(DciFileVersionName);
if (FileVersion >= 0) then
FileVersion := StrToIntDef(AnAutoComplete.CompletionAttributes[0][FileVersion], 0);
end;
if FileVersion < DciFileVersion then begin
// Merge new entries
NewAutoComplete := TSynEditAutoComplete.Create(nil);
NewAutoComplete.AutoCompleteList.Text := ResourceDCIAsText;
Added := False;
for i := 0 to NewAutoComplete.Completions.Count - 1 do begin
j := NewAutoComplete.CompletionAttributes[i].IndexOfName(DciVersionName);
if j < 0 then
continue;
v := StrToIntDef(NewAutoComplete.CompletionAttributes[i][j], 0);
if v <= FileVersion then
continue;
if AnAutoComplete.Completions.IndexOf(NewAutoComplete.Completions[i]) >= 0 then
continue;
Attr := TStringList.Create;
Attr.Assign(NewAutoComplete.CompletionAttributes[i]); // will be owned by AnAutoComplete;
AnAutoComplete.AddCompletion(
NewAutoComplete.Completions[i],
NewAutoComplete.CompletionValues[i],
NewAutoComplete.CompletionComments[i],
Attr);
Added := True;
end;
NewAutoComplete.Free;
if Added then
if BuildBorlandDCIFile(AnAutoComplete) then
SaveCodeTemplates(AnAutoComplete);
end;
end
else begin
AnAutoComplete.AutoCompleteList.Text := ResourceDCIAsText;