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

Codetools: Include fdfSearchInAncestors when resolving aliases, specializations or properties. "procedure SearchIdentifier" in "TFindDeclarationTool.FindBaseTypeOfNode". Fix issue #39498

Browse Source 
Added test
This commit is contained in:
Martin 2022-03-11 16:51:17 +01:00
parent 0e3c87e83d
commit de1c148c6e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/finddeclarationtool.pas
View File

@ -194,6 +194,7 @@ const
fdfGlobals = [fdfExceptionOnNotFound, fdfTopLvlResolving,
fdfExtractOperand, fdfPropertyResolving,
fdfOverrideStringTypesWithFirstParamType];
fdfGlobalsAndAncestor = fdfGlobals+[fdfSearchInAncestors];
fdfGlobalsSameIdent = fdfGlobals+[fdfExceptionOnPredefinedIdent,
fdfIgnoreMissingParams, fdfIgnoreUsedUnits, fdfDoNotCache,
fdfOnlyCompatibleProc, fdfSearchInAncestors, fdfCollect, fdfSearchInHelpers];
@ -5268,7 +5269,7 @@ var
debugln(['TFindDeclarationTool.FindBaseTypeOfNode.SearchIdentifier Identifier=',GetIdentifier(@Src[IdentStart])]);
{$ENDIF}
SubParams.Flags:=[fdfSearchInParentNodes,fdfExceptionOnNotFound]
+(fdfGlobals*Params.Flags);
+(fdfGlobalsAndAncestor*Params.Flags);
SubParams.ContextNode:=StartNode.Parent;
if (SubParams.ContextNode.Desc in (AllIdentifierDefinitions))
then begin

2
components/codetools/tests/moduletests/fdt_nestedaliasclass.pas
View File

@ -25,7 +25,7 @@ type
TAliasBirdWing = TBirdWing{declaration:fdt_nestedaliasclass.TBird.TBirdWing};
TEagleWing = class(TAliasBirdWing{declaration:fdt_nestedaliasclass.TEagle.TAliasBirdWing})
public
procedure Fly; override;
procedure Fly{declaration:fdt_nestedaliasclass.TBird.TBirdWing.Fly}; override;
end;
end;