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

IDE: Fix reading ancestor type TFrame for object in LFM when it is not a direct ancestor. Issue #38585.

Browse Source 
git-svn-id: trunk@64763 -
This commit is contained in:
juha 2021-03-07 13:24:52 +00:00
parent 2fa9987008
commit bda23a6856
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ide/sourcefilemanager.pas
View File

@ -6476,16 +6476,14 @@ begin
end;
function LoadAncestorDependencyHidden(AnUnitInfo: TUnitInfo;
const aComponentClassName: string;
OpenFlags: TOpenFlags;
const aComponentClassName: string; OpenFlags: TOpenFlags;
out AncestorClass: TComponentClass;
out AncestorUnitInfo: TUnitInfo): TModalResult;
var
AncestorClassName, IgnoreBtnText: String;
AncsClsName, S: String;
CodeBuf: TCodeBuffer;
GrandAncestorClass, DefAncestorClass: TComponentClass;
begin
AncestorClassName:='';
AncestorClass:=nil;
AncestorUnitInfo:=nil;
@ -6496,22 +6494,22 @@ begin
if Result<>mrOk then exit;
AnUnitInfo.Source:=CodeBuf;
end;
if not CodeToolBoss.FindFormAncestor(AnUnitInfo.Source,aComponentClassName,
AncestorClassName,true)
then begin
DebugLn('LoadAncestorDependencyHidden Filename="',AnUnitInfo.Filename,'" ClassName=',aComponentClassName,'. Unable to find ancestor class: ',CodeToolBoss.ErrorMessage);
end;
// try the base designer classes
if not FindBaseComponentClass(AnUnitInfo,AncestorClassName,
aComponentClassName,AncestorClass) then
begin
DebugLn(['LoadAncestorDependencyHidden FindUnitComponentClass failed for AncestorClassName=',AncestorClassName]);
exit(mrCancel);
end;
S:=aComponentClassName;
repeat
if not CodeToolBoss.FindFormAncestor(AnUnitInfo.Source,S,AncsClsName,true) then
DebugLn('LoadAncestorDependencyHidden Filename="',AnUnitInfo.Filename,'" ClassName=',aComponentClassName,
'. Unable to find ancestor class: ',CodeToolBoss.ErrorMessage);
// try the base designer classes
if not FindBaseComponentClass(AnUnitInfo,AncsClsName,S,AncestorClass) then
begin
DebugLn(['LoadAncestorDependencyHidden FindUnitComponentClass failed for AncsClsName=',AncsClsName]);
exit(mrCancel);
end;
S:=AncsClsName;
until Assigned(AncestorClass);
// try loading the ancestor first (unit, lfm and component instance)
if AnUnitInfo.UnitResourceFileformat<>nil then
DefAncestorClass:=AnUnitInfo.UnitResourceFileformat.DefaultComponentClass
else
@ -6521,13 +6519,11 @@ begin
DefAncestorClass:=BaseFormEditor1.StandardDesignerBaseClasses[DesignerBaseClassId_TForm];
if (AncestorClass=nil) then begin
IgnoreBtnText:='';
S:='';
if DefAncestorClass<>nil then
IgnoreBtnText:=Format(lisIgnoreUseAsAncestor, [DefAncestorClass.ClassName]);
Result:=LoadComponentDependencyHidden(AnUnitInfo,AncestorClassName,
OpenFlags,false,AncestorClass,AncestorUnitInfo,GrandAncestorClass,
IgnoreBtnText);
S:=Format(lisIgnoreUseAsAncestor, [DefAncestorClass.ClassName]);
Result:=LoadComponentDependencyHidden(AnUnitInfo,AncsClsName,OpenFlags,
false,AncestorClass,AncestorUnitInfo,GrandAncestorClass,S);
if Result<>mrOk then begin
DebugLn(['LoadAncestorDependencyHidden DoLoadComponentDependencyHidden failed AnUnitInfo=',AnUnitInfo.Filename]);
end;
@ -6543,7 +6539,7 @@ begin
end;
end;
//DebugLn('LoadAncestorDependencyHidden Filename="',AnUnitInfo.Filename,'" AncestorClassName=',AncestorClassName,' AncestorClass=',dbgsName(AncestorClass));
//DebugLn('LoadAncestorDependencyHidden Filename="',AnUnitInfo.Filename,'" AncsClsName=',AncsClsName,' AncestorClass=',dbgsName(AncestorClass));
if AncestorClass=nil then
AncestorClass:=DefAncestorClass;
Result:=mrOk;